linux-toradex.git/drivers/pcmcia, branch v2.6.31.10

PM / yenta: Split resume into early and late parts (rev. 4)

2009-11-10T00:23:17+00:00

commit 9905d1b411946fb3fb228e8c6529fd94afda8a92 upstream.

Commit 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c
(PM / yenta: Fix cardbus suspend/resume regression) caused resume to
fail on systems with two CardBus bridges.  While the exact nature
of the failure is not known at the moment, it can be worked around by
splitting the yenta resume into an early part, executed during the
early phase of resume, that will only resume the socket and power it
up if there was a card in it during suspend, and a late part,
executed during "regular" resume, that will carry out all of the
remaining yenta resume operations.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=14334, which is a
listed regression from 2.6.31.

Signed-off-by: Rafael J. Wysocki 
Acked-by: Dominik Brodowski 
Reported-by: Stephen J. Gowdy 
Tested-by: Jose Marino 
Signed-off-by: Greg Kroah-Hartman

PM / yenta: Fix cardbus suspend/resume regression

2009-10-05T16:31:48+00:00

commit 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c upstream.

Since 2.6.29 the PCI PM core have been restoring the standard
configuration registers of PCI devices in the early phase of
resume.  In particular, PCI devices without drivers have been handled
this way since commit 355a72d75b3b4f4877db4c9070c798238028ecb5
(PCI: Rework default handling of suspend and resume).  Unfortunately,
this leads to post-resume problems with CardBus devices which cannot
be accessed in the early phase of resume, because the sockets they
are on have not been woken up yet at that point.

To solve this problem, move the yenta socket resume to the early
phase of resume and, analogously, move the suspend of it to the late
phase of suspend.  Additionally, remove some unnecessary PCI code
from the yenta socket's resume routine.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=13092, which is a
post-2.6.28 regression.

Signed-off-by: Rafael J. Wysocki 
Reported-by: Florian 
Signed-off-by: Greg Kroah-Hartman

PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()

2009-10-05T16:31:48+00:00

commit 827b4649d4626bf97b203b4bcd69476bb9b4e760 upstream.

pcmcia_socket_dev_suspend() doesn't use its second argument, so it
may be dropped safely.

This change is necessary for the subsequent yenta suspend/resume fix.

Signed-off-by: Rafael J. Wysocki 
Signed-off-by: Greg Kroah-Hartman

Remove multiple KERN_ prefixes from printk formats

2009-07-08T17:30:03+00:00

Commit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f ("printk: clean up
handling of log-levels and newlines") changed printk semantics.  printk
lines with multiple KERN_ prefixes are no longer emitted as
before the patch.

 is now included in the output on each additional use.

Remove all uses of multiple KERN_s in formats.

Signed-off-by: Joe Perches 
Signed-off-by: Linus Torvalds

Update Yoichi Yuasa's e-mail address

2009-07-03T14:45:29+00:00

Signed-off-by: Yoichi Yuasa 
Signed-off-by: Ralf Baechle

Merge branch 'akpm'

2009-06-17T02:50:13+00:00

* akpm: (182 commits)
  fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset
  fbdev: *bfin*: fix __dev{init,exit} markings
  fbdev: *bfin*: drop unnecessary calls to memset
  fbdev: bfin-t350mcqb-fb: drop unused local variables
  fbdev: blackfin has __raw I/O accessors, so use them in fb.h
  fbdev: s1d13xxxfb: add accelerated bitblt functions
  tcx: use standard fields for framebuffer physical address and length
  fbdev: add support for handoff from firmware to hw framebuffers
  intelfb: fix a bug when changing video timing
  fbdev: use framebuffer_release() for freeing fb_info structures
  radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?
  s3c-fb: CPUFREQ frequency scaling support
  s3c-fb: fix resource releasing on error during probing
  carminefb: fix possible access beyond end of carmine_modedb[]
  acornfb: remove fb_mmap function
  mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF
  mb862xxfb: restrict compliation of platform driver to PPC
  Samsung SoC Framebuffer driver: add Alpha Channel support
  atmel-lcdc: fix pixclock upper bound detection
  offb: use framebuffer_alloc() to allocate fb_info struct
  ...

Manually fix up conflicts due to kmemcheck in mm/slab.c

use printk_once() in several places

2009-06-17T02:47:50+00:00

There are some places to be able to use printk_once instead of hard coding.

Signed-off-by: Minchan Kim 
Cc: Dominik Brodowski 
Cc: David S. Miller 
Cc: Ingo Molnar 
Cc: KOSAKI Motohiro 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

pcmcia: remove driver_data direct access of struct device

2009-06-16T04:30:27+00:00

In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device.  Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.

Cc: linux-pcmcia@lists.infradead.org
Cc: Dominik Brodowski 
Signed-off-by: Greg Kroah-Hartman

firmware: pcmcia/ds: prepare for FIRMWARE_NAME_MAX removal

2009-06-16T04:30:25+00:00

We're going to remove the FIRMWARE_NAME_MAX definition in order to avoid any
firmware name length restriction.
With the FIRMWARE_NAME_MAX removal, the ds.c reference becomes useless as we
dont need to check for the firmware name length anymore.

Signed-off-by: Samuel Ortiz 
Cc: Dominik Brodowski 
Signed-off-by: Greg Kroah-Hartman

[ARM] pxa/stargate2: add support for Compact Flash/PCMCIA

2009-06-05T02:46:32+00:00

Signed-off-by: Jonathan Cameron 
Signed-off-by: Eric Miao