[git pull] PCMCIA updates for 2.6.34

[git pull] PCMCIA updates for 2.6.34

[Dominik Brodowski]

Linus,

several PCMCIA updates for 2.6.33 are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git master

Please pull from that location. The diffstat and list of changes is below,
the individual diffs are sent (at least) to the linux-pcmcia list.

Thanks,
        Dominik

Dominik Brodowski (41):
      pcmcia: make use of pcmcia_dev_resume() return value
      pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter
      pcmcia: do not meddle with already assigned resources
      pcmcia: validate CIS, not CIS cache.
      pcmcia: cleanup pccard_validate_cis()
      pcmcia: improve check for same card in slot after resume
      pcmcia: CardBus doesn't need CIS access
      pcmcia: call CIS cleanup from ds.c
      pcmcia: rsrc_nonstatic io memory probe improvements
      pcmcia: do not lock socket driver module in pcmcia_get_socket()
      pcmcia: do not lock socket driver module on card insert
      pcmcia: remove useless indirection
      pcmcia: remove some rsrc_mgr indirections
      pcmcia: m32r uses static socket resources
      pcmcia: m8xx_pcmcia.c should use iodyn resource manager
      pcmcia: move cistpl.c into pcmcia module
      pcmcia: remove remaining rsrc_mgr indirections
      pcmcia: do not use resource manager on !PCMCIA
      pcmcia: add locking to set_mem_map()
      pcmcia: also lock fake and cache CIS by ops_mutex
      pcmcia: lock ops->set_io_map()
      pcmcia: lock ops->set_socket
      pcmcia: properly lock skt->irq, skt->irq_mask
      pcmcia: protect s->device_count
      pcmcia: add locking to struct pcmcia_socket->pcmcia_state()
      pcmcia: simplify locking
      pcmcia: add locking documentation
      pcmcia: assert locking to struct pcmcia_device
      pcmcia: use mutex for dynid lock
      pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking
      pcmcia: use pccardd to handle eject, insert, suspend and resume requests
      pcmcia: delay re-scanning and re-querying of PCMCIA bus
      pcmcia: use state machine for extended requery
      pcmcia: avoid sysfs-related lockup for cardbus
      pcmcia: avoid prod_id memleak
      pcmcia: add locking to pcmcia_{read,write}_cis_mem
      pcmcia: handle error in serial_cs config calls
      pcmcia: use read_cis_mem return value
      pcmcia: remove useless msleep in ds.c
      pcmcia: allow for extension of resource interval
      pcmcia: validate late-added resources

H Hartley Sweeten (1):
      cm4000_cs.c: Remove unnecessary cast

Michal Marek (1):
      pcmcia: fix yenta dependency on PCCARD_NONSTATIC

Márton Németh (1):
      pcmcia: make Open Firmware device id constant

Uwe Kleine-König (3):
      pcmcia/bfin_cf: don't check platform_get_irq's return value against zero
      pcmcia/at91_cf: don't redefine SZ_2K
      pcmcia/omap_cf: don't redefine SZ_2K

Wolfram Sang (2):
      pcmcia/yenta: add module parameter for O2 speedups
      pcmcia/i82365: fix typos in comments

 Documentation/pcmcia/locking.txt |  118 ++++++++
 drivers/char/pcmcia/cm4000_cs.c  |    2 +-
 drivers/net/pcmcia/smc91c92_cs.c |    6 +-
 drivers/pcmcia/Kconfig           |    9 +-
 drivers/pcmcia/Makefile          |    4 +-
 drivers/pcmcia/at91_cf.c         |    2 -
 drivers/pcmcia/bfin_cf_pcmcia.c  |    2 +-
 drivers/pcmcia/cardbus.c         |  175 +----------
 drivers/pcmcia/cistpl.c          |  606 +++++++++++++++++++++-----------------
 drivers/pcmcia/cs.c              |  312 +++++++++-----------
 drivers/pcmcia/cs_internal.h     |   89 ++----
 drivers/pcmcia/ds.c              |  333 ++++++++++++---------
 drivers/pcmcia/electra_cf.c      |    2 +-
 drivers/pcmcia/i82365.h          |    4 +-
 drivers/pcmcia/m32r_cfc.c        |    2 +-
 drivers/pcmcia/m8xx_pcmcia.c     |    4 +-
 drivers/pcmcia/o2micro.h         |   45 ++-
 drivers/pcmcia/omap_cf.c         |    2 -
 drivers/pcmcia/pcmcia_ioctl.c    |   42 ++--
 drivers/pcmcia/pcmcia_resource.c |  169 +++++++++---
 drivers/pcmcia/rsrc_mgr.c        |   48 ---
 drivers/pcmcia/rsrc_nonstatic.c  |  285 +++++++++++-------
 drivers/pcmcia/socket_sysfs.c    |  196 ++-----------
 drivers/pcmcia/yenta_socket.c    |    5 +
 drivers/serial/serial_cs.c       |    7 +-
 include/pcmcia/ds.h              |    2 +-
 include/pcmcia/ss.h              |   40 ++-
 27 files changed, 1257 insertions(+), 1254 deletions(-)
 create mode 100644 Documentation/pcmcia/locking.txt

[PATCH 02/49] pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter

[Dominik Brodowski]

Komuro pointed out correctly that I missed one IRQ_FIRST_SHARED
parameter in smc91c92_cs.c, and that another line could be writter
more beautifully.

CC: netdev@vger.kernel.org
CC: Komuro <komurojun-mbn@nifty.com>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/net/pcmcia/smc91c92_cs.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 6dd486d..aa57cfd 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -453,8 +453,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)
 
     link->conf.Attributes |= CONF_ENABLE_SPKR;
     link->conf.Status = CCSR_AUDIO_ENA;
-    link->irq.Attributes =
-	IRQ_TYPE_DYNAMIC_SHARING;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
     link->io.IOAddrLines = 16;
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
     link->io.NumPorts2 = 8;
@@ -652,8 +651,7 @@ static int osi_config(struct pcmcia_device *link)
 
     link->conf.Attributes |= CONF_ENABLE_SPKR;
     link->conf.Status = CCSR_AUDIO_ENA;
-    link->irq.Attributes =
-	IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
     link->io.NumPorts1 = 64;
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
     link->io.NumPorts2 = 8;
-- 
1.6.3.3

[PATCH 45/49] pcmcia: handle error in serial_cs config calls

[Dominik Brodowski]

Do not ignore the error returned by simple_config() / multi_config().

CC: linux-serial@vger.kernel.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/serial/serial_cs.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 0ee7239..8d38eab 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -695,11 +695,11 @@ static int serial_config(struct pcmcia_device * link)
 		info->multi = info->quirk->multi;
 
 	if (info->multi > 1)
-		multi_config(link);
+		i = multi_config(link);
 	else
-		simple_config(link);
+		i = simple_config(link);
 
-	if (info->ndev == 0)
+	if (i || info->ndev == 0)
 		goto failed;
 
 	/*
@@ -714,6 +714,7 @@ static int serial_config(struct pcmcia_device * link)
 	return 0;
 
 failed:
+	dev_warn(&link->dev, "serial_cs: failed to initialize\n");
 	serial_remove(link);
 	return -ENODEV;
 }
-- 
1.6.3.3