PCMCIA updates for 2.6.17
Subsystems (17)
Dominik Brodowski
maintainerHi,
Please pull from
http://www.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git/
The diffstat and list of changes follows:
----
Documentation/pcmcia/driver-changes.txt | 6 drivers/bluetooth/bluecard_cs.c | 119 ++------- drivers/bluetooth/bt3c_cs.c | 130 +++------- drivers/bluetooth/btuart_cs.c | 130 +++------- drivers/bluetooth/dtl1_cs.c | 120 ++------- drivers/char/pcmcia/cm4000_cs.c | 121 +++------ drivers/char/pcmcia/cm4040_cs.c | 133 +++------- drivers/char/pcmcia/synclink_cs.c | 116 +++------ drivers/ide/legacy/ide-cs.c | 127 +++------- drivers/isdn/hardware/avm/avm_cs.c | 185 ++++---------- drivers/isdn/hisax/avma1_cs.c | 182 ++++---------- drivers/isdn/hisax/elsa_cs.c | 110 +++----- drivers/isdn/hisax/sedlbauer_cs.c | 143 +++-------- drivers/isdn/hisax/teles_cs.c | 119 +++------ drivers/mtd/maps/pcmciamtd.c | 115 +++------ drivers/net/pcmcia/3c574_cs.c | 115 +++------ drivers/net/pcmcia/3c589_cs.c | 122 +++------ drivers/net/pcmcia/axnet_cs.c | 126 +++------- drivers/net/pcmcia/com20020_cs.c | 127 +++------- drivers/net/pcmcia/fmvj18x_cs.c | 166 +++++-------- drivers/net/pcmcia/ibmtr_cs.c | 121 +++------ drivers/net/pcmcia/nmclan_cs.c | 126 +++------- drivers/net/pcmcia/pcnet_cs.c | 161 +++++------- drivers/net/pcmcia/smc91c92_cs.c | 235 ++++++++---------- drivers/net/pcmcia/xirc2ps_cs.c | 185 ++++++-------- drivers/net/wireless/airo_cs.c | 158 +++--------- drivers/net/wireless/atmel_cs.c | 162 ++++-------- drivers/net/wireless/hostap/hostap_cs.c | 200 ++++++--------- drivers/net/wireless/netwave_cs.c | 127 +++------- drivers/net/wireless/orinoco_cs.c | 189 +++++---------- drivers/net/wireless/ray_cs.c | 277 ++++++++-------------- drivers/net/wireless/ray_cs.h | 2 drivers/net/wireless/spectrum_cs.c | 173 +++++-------- drivers/net/wireless/wavelan_cs.c | 189 +++++---------- drivers/net/wireless/wavelan_cs.p.h | 6 drivers/net/wireless/wl3501.h | 1 drivers/net/wireless/wl3501_cs.c | 178 ++++---------- drivers/parport/parport_cs.c | 129 ++-------- drivers/pcmcia/Kconfig | 7 drivers/pcmcia/Makefile | 3 drivers/pcmcia/at91_cf.c | 365 +++++++++++++++++++++++++++++ drivers/pcmcia/cistpl.c | 1 drivers/pcmcia/cs.c | 43 +-- drivers/pcmcia/cs_internal.h | 19 - drivers/pcmcia/ds.c | 249 ++++++++++++------- drivers/pcmcia/ds_internal.h | 4 drivers/pcmcia/i82092.c | 1 drivers/pcmcia/i82365.c | 1 drivers/pcmcia/pcmcia_compat.c | 65 ----- drivers/pcmcia/pcmcia_ioctl.c | 81 ++++-- drivers/pcmcia/pcmcia_resource.c | 224 +++++++++-------- drivers/pcmcia/pd6729.c | 1 drivers/pcmcia/rsrc_mgr.c | 5 drivers/pcmcia/rsrc_nonstatic.c | 41 +-- drivers/pcmcia/sa1100_cerf.c | 1 drivers/pcmcia/socket_sysfs.c | 10 drivers/pcmcia/ti113x.h | 1 drivers/scsi/pcmcia/aha152x_stub.c | 112 ++------ drivers/scsi/pcmcia/fdomain_stub.c | 149 ++++------- drivers/scsi/pcmcia/nsp_cs.c | 136 +++------- drivers/scsi/pcmcia/nsp_cs.h | 8 drivers/scsi/pcmcia/qlogic_stub.c | 127 +++------- drivers/scsi/pcmcia/sym53c500_cs.c | 124 +++------ drivers/serial/serial_cs.c | 229 ++++++++---------- drivers/telephony/ixj_pcmcia.c | 119 ++------- drivers/usb/host/sl811_cs.c | 119 ++------- include/asm-arm/arch-at91rm9200/hardware.h | 3 include/pcmcia/bulkmem.h | 4 include/pcmcia/ciscode.h | 5 include/pcmcia/cistpl.h | 21 + include/pcmcia/cs.h | 34 +- include/pcmcia/ds.h | 80 +++--- include/pcmcia/ss.h | 11 sound/pcmcia/pdaudiocf/pdaudiocf.c | 86 +----- sound/pcmcia/pdaudiocf/pdaudiocf.h | 2 sound/pcmcia/vx/vxpocket.c | 94 ++----- sound/pcmcia/vx/vxpocket.h | 2 77 files changed, 3150 insertions(+), 4568 deletions(-)
----
Adrian Bunk:
pcmcia: make pcmcia_release_{io,irq} static
Andrew Victor:
pcmcia: AT91RM9200 Compact Flash driver
Domen Puncer:
serial_cs: add Merlin U630 IDs
Dominik Brodowski:
pcmcia: remove unused field Present from config_t
pcmcia: access config_t using pointer instead of array
pcmcia: always use device pointer to config_t
pcmcia: make config_t independent, add reference counting
pcmcia: remove unused defines
pcmcia: use mutexes instead of semaphores
pcmcia: remove include of config.h
pcmcia: remove pcmcia_compat.c
pcmcia: size reduction if ioctl isn't compiled
pcmcia: remove duplicate fields in io_window_t
parport_cs: don't play games with resources
pcmcia: socket.functions starts with 1
pcmcia: add pcmcia_disable_device
pcmcia: convert remaining users of pcmcia_release_io and _irq
pcmcia: default suspend and resume handling
pcmcia: remove export of pcmcia_release_configuration
pcmcia: remove unneeded Vcc pseudo setting
pcmcia: rename pcmcia_device.state
pcmcia: embed dev_link_t into struct pcmcia_device
pcmcia: remove dev_link_t and client_handle_t indirection
pcmcia: add return value to _config() functions
pcmcia: remove unused p_dev->state flags
pcmcia: use bitfield instead of p_state and state
pcmcia: convert DEV_OK to pcmcia_dev_present
pcmcia: pseudo device handling update
Hugh Dickins:
pcmcia: fix pcmcia_device_remove oops
Janos Farkas:
pcmcia: permit single-character identifiers
Komuro:
pcmcia: remove wrong comment in ciscode.h
Marcelo Tosatti:
pcmcia: declare pccard_iodyn_ops (fix m8xx_pcmcia.c compilation error)
Petr Vandrovec:
pcmcia: Add support for Possio GCC AKA PCMCIA Siemens MC45
All patches are available using the git web interface at
http://kernel.org/git/ and all but the largest ones (19, 21, 23, 24, 25 and 28) will be posted to the linux-pcmcia mailing list; all patches affecting other subsystems or drivers will be sent to the specific lists or (at least) to lkml.
Dominik
Dominik Brodowski
maintainerPATCH 16/33 serial_cs: add Merlin U630 IDs
From: Domen Puncer <[email protected]>
Add Merlin U630 IDs.
---
drivers/serial/serial_cs.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
1de9cedfbdff1d8adb662cd3afc5bda66e393351
drivers/serial/serial_cs.c +2 -0
@@ -739,6 +739,7 @@ static struct pcmcia_device_id serial_idPCMCIA_MFC_DEVICE_PROD_ID1 (1 ,"Motorola MARQUIS" ,0xf03e4e77 ),PCMCIA_MFC_DEVICE_PROD_ID2 (1 ,"FAX/Modem/Ethernet Combo Card " ,0x1ed59302 ),PCMCIA_DEVICE_MANF_CARD (0x0089 ,0x0301 ), +PCMCIA_DEVICE_MANF_CARD (0x00a4 ,0x0276 ),PCMCIA_DEVICE_MANF_CARD (0x0101 ,0x0039 ),PCMCIA_DEVICE_MANF_CARD (0x0104 ,0x0006 ), PCMCIA_DEVICE_MANF_CARD(0x0105, 0x410a),
@@ -757,6 +758,7 @@ static struct pcmcia_device_id serial_idPCMCIA_DEVICE_PROD_ID14 ("MEGAHERTZ" ,"PCMCIA MODEM" ,0xf510db04 ,0xbd6c43ef ),PCMCIA_DEVICE_PROD_ID124 ("TOSHIBA" ,"T144PF" ,"PCMCIA MODEM" ,0xb4585a1a ,0x7271409c ,0xbd6c43ef ),PCMCIA_DEVICE_PROD_ID123 ("FUJITSU" ,"FC14F " ,"MBH10213" ,0x6ee5a3d8 ,0x30ead12b ,0xb00f05a0 ), +PCMCIA_DEVICE_PROD_ID123 ("Novatel Wireless" ,"Merlin UMTS Modem" ,"U630" ,0x32607776 ,0xd9e73b13 ,0xe87332e ),PCMCIA_DEVICE_PROD_ID13 ("MEGAHERTZ" ,"V.34 PCMCIA MODEM" ,0xf510db04 ,0xbb2cce4a ),PCMCIA_DEVICE_PROD_ID12 ("Brain Boxes" ,"Bluetooth PC Card" ,0xee138382 ,0xd4ce9b02 ), PCMCIA_DEVICE_PROD_ID12("CIRRUS LOGIC", "FAX MODEM", 0xe625f451, 0xcecd6dfa),
Signature · 1 line
1.2.4
Dominik Brodowski
maintainerPATCH 17/33 pcmcia: add pcmcia_disable_device
In reply to Dominik Brodowskipcmcia_disable_device(struct pcmcia_device *p_dev) performs the necessary cleanups upon device or driver removal: it calls the appropriate pcmcia_release_* functions, and can replace (most) of the current drivers' _release() functions.
---
Documentation/pcmcia/driver-changes.txt | 6 +++ drivers/bluetooth/bluecard_cs.c | 8 --- drivers/bluetooth/bt3c_cs.c | 8 --- drivers/bluetooth/btuart_cs.c | 8 --- drivers/bluetooth/dtl1_cs.c | 8 --- drivers/char/pcmcia/cm4000_cs.c | 3 - drivers/char/pcmcia/cm4040_cs.c | 3 - drivers/char/pcmcia/synclink_cs.c | 10 ---- drivers/ide/legacy/ide-cs.c | 8 --- drivers/isdn/hardware/avm/avm_cs.c | 12 +---- drivers/isdn/hisax/avma1_cs.c | 17 ++----- drivers/isdn/hisax/elsa_cs.c | 10 ---- drivers/isdn/hisax/sedlbauer_cs.c | 17 ------- drivers/isdn/hisax/teles_cs.c | 10 ---- drivers/net/pcmcia/3c574_cs.c | 8 --- drivers/net/pcmcia/3c589_cs.c | 8 --- drivers/net/pcmcia/axnet_cs.c | 8 --- drivers/net/pcmcia/com20020_cs.c | 12 +---- drivers/net/pcmcia/fmvj18x_cs.c | 12 +---- drivers/net/pcmcia/ibmtr_cs.c | 23 ++++------ drivers/net/pcmcia/nmclan_cs.c | 10 +--- drivers/net/pcmcia/pcnet_cs.c | 15 ++----- drivers/net/pcmcia/smc91c92_cs.c | 21 +++------ drivers/net/pcmcia/xirc2ps_cs.c | 22 +++------- drivers/net/wireless/airo_cs.c | 19 -------- drivers/net/wireless/atmel_cs.c | 21 +++------ drivers/net/wireless/hostap/hostap_cs.c | 11 ----- drivers/net/wireless/netwave_cs.c | 19 +++----- drivers/net/wireless/orinoco_cs.c | 8 --- drivers/net/wireless/spectrum_cs.c | 8 --- drivers/net/wireless/wavelan_cs.c | 18 +++----- drivers/net/wireless/wl3501_cs.c | 10 +--- drivers/parport/parport_cs.c | 26 ++++------- drivers/pcmcia/pcmcia_resource.c | 71 ++++++++++++++++++------------- drivers/scsi/pcmcia/aha152x_stub.c | 8 --- drivers/scsi/pcmcia/fdomain_stub.c | 17 ++----- drivers/scsi/pcmcia/nsp_cs.c | 11 +---- drivers/scsi/pcmcia/qlogic_stub.c | 9 +--- drivers/scsi/pcmcia/sym53c500_cs.c | 8 --- drivers/serial/serial_cs.c | 7 +-- include/pcmcia/cs.h | 2 + sound/pcmcia/pdaudiocf/pdaudiocf.c | 8 --- sound/pcmcia/vx/vxpocket.c | 8 --- 43 files changed, 154 insertions(+), 402 deletions(-)
5f2a71fcb7995633b335a1e380ac63a968e61320
Documentation/pcmcia/driver-changes.txt +6 -0
@@ -1,5 +1,11 @@ This file details changes in 2.6 which affect PCMCIA card driver authors: +* New release helper (as of 2.6.17) + Instead of calling pcmcia_release_{configuration,io,irq,win}, all that's + necessary now is calling pcmcia_disable_device. As there is no valid + reason left to call pcmcia_release_io and pcmcia_release_irq, they will + be removed soon. + * Unify detach and REMOVAL event code, as well as attach and INSERTION code (as of 2.6.16) void (*remove) (struct pcmcia_device *dev);
drivers/bluetooth/bluecard_cs.c +1 -7
@@ -1002,13 +1002,7 @@ static void bluecard_release(dev_link_tdel_timer (&(info->timer)); - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int bluecard_suspend (struct pcmcia_device *dev)
drivers/bluetooth/bt3c_cs.c +1 -7
@@ -839,13 +839,7 @@ static void bt3c_release(dev_link_t *linif (link->state &DEV_PRESENT )bt3c_close (info); - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int bt3c_suspend (struct pcmcia_device *dev)
drivers/bluetooth/btuart_cs.c +1 -7
@@ -768,13 +768,7 @@ static void btuart_release(dev_link_t *lif (link->state &DEV_PRESENT )btuart_close (info); - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int btuart_suspend (struct pcmcia_device *dev)
drivers/bluetooth/dtl1_cs.c +1 -7
@@ -720,13 +720,7 @@ static void dtl1_release(dev_link_t *linif (link->state &DEV_PRESENT )dtl1_close (info); - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int dtl1_suspend (struct pcmcia_device *dev)
drivers/char/pcmcia/cm4000_cs.c +1 -2
@@ -1899,8 +1899,7 @@ static int cm4000_resume(struct pcmcia_dstatic void cm4000_release (dev_link_t *link) {cmm_cm4000_release (link->priv);/* delay release until device closed */ -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); +pcmcia_disable_device (link->handle); }static int cm4000_attach (struct pcmcia_device *p_dev)
drivers/char/pcmcia/cm4040_cs.c +1 -2
@@ -654,8 +654,7 @@ static int reader_resume(struct pcmcia_dstatic void reader_release (dev_link_t *link) {cm4040_reader_release (link->priv); -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); +pcmcia_disable_device (link->handle); }static int reader_attach (struct pcmcia_device *p_dev)
drivers/char/pcmcia/synclink_cs.c +1 -9
@@ -710,15 +710,7 @@ static void mgslpc_release(u_long arg)if (debug_level >=DEBUG_LEVEL_INFO )printk ("mgslpc_release(0x%p)\n" , link); -/* Unlink the device chain */ - link->dev =NULL ; - link->state &= ~DEV_CONFIG ; - -pcmcia_release_configuration (link->handle); -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); -if (link->irq.AssignedIRQ) -pcmcia_release_irq (link->handle, &link->irq); +pcmcia_disable_device (link->handle); }static void mgslpc_detach (struct pcmcia_device *p_dev)
drivers/ide/legacy/ide-cs.c +1 -7
@@ -369,14 +369,8 @@ void ide_release(dev_link_t *link)ide_unregister (info->hd); } info->ndev =0 ; - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }/* ide_release */ static int ide_suspend (struct pcmcia_device *dev)
drivers/isdn/hardware/avm/avm_cs.c +2 -10
@@ -367,16 +367,8 @@ found_port:static void avmcs_release (dev_link_t *link) { -b1pcmcia_delcard (link->io.BasePort1, link->irq.AssignedIRQ); - -/* Unlink the device chain */ - link->dev =NULL ; - -/* Don't bother checking to see if these succeed or not */ -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +b1pcmcia_delcard (link->io.BasePort1, link->irq.AssignedIRQ); +pcmcia_disable_device (link->handle); }/* avmcs_release */ static int avmcs_suspend (struct pcmcia_device *dev)
drivers/isdn/hisax/avma1_cs.c +5 -12
@@ -373,21 +373,14 @@ found_port:static void avma1cs_release (dev_link_t *link) { -local_info_t *local = link->priv; +local_info_t *local = link->priv; -DEBUG (0 ,"avma1cs_release(0x%p)\n" , link); +DEBUG (0 ,"avma1cs_release(0x%p)\n" , link); -/* no unregister function with hisax */ -HiSax_closecard (local->node.minor); +/* now unregister function with hisax */ +HiSax_closecard (local->node.minor); -/* Unlink the device chain */ - link->dev =NULL ; - -/* Don't bother checking to see if these succeed or not */ -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }/* avma1cs_release */ static int avma1cs_suspend (struct pcmcia_device *dev)
drivers/isdn/hisax/elsa_cs.c +1 -9
@@ -380,16 +380,8 @@ static void elsa_cs_release(dev_link_t *HiSax_closecard (local->cardnr); } } -/* Unlink the device chain */ - link->dev =NULL ; -/* Don't bother checking to see if these succeed or not */ -if (link->win) -pcmcia_release_window (link->win); -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }/* elsa_cs_release */ static int elsa_suspend (struct pcmcia_device *p_dev)
drivers/isdn/hisax/sedlbauer_cs.c +1 -16
@@ -467,23 +467,8 @@ static void sedlbauer_release(dev_link_tHiSax_closecard (local->cardnr); } } -/* Unlink the device chain */ - link->dev =NULL ; -/* -In a normal driver, additional code may be needed to release -other kernel data structures associated with this device. -*/ - -/* Don't bother checking to see if these succeed or not */ -if (link->win) -pcmcia_release_window (link->win); -pcmcia_release_configuration (link->handle); -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); -if (link->irq.AssignedIRQ) -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }/* sedlbauer_release */ static int sedlbauer_suspend (struct pcmcia_device *p_dev)
drivers/isdn/hisax/teles_cs.c +1 -9
@@ -371,16 +371,8 @@ static void teles_cs_release(dev_link_tHiSax_closecard (local->cardnr); } } -/* Unlink the device chain */ - link->dev =NULL ; -/* Don't bother checking to see if these succeed or not */ -if (link->win) -pcmcia_release_window (link->win); -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }/* teles_cs_release */ static int teles_suspend (struct pcmcia_device *p_dev)
drivers/net/pcmcia/3c574_cs.c +1 -7
@@ -511,13 +511,7 @@ failed:static void tc574_release (dev_link_t *link) { -DEBUG (0 ,"3c574_release(0x%p)\n" , link); - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int tc574_suspend (struct pcmcia_device *p_dev)
drivers/net/pcmcia/3c589_cs.c +1 -7
@@ -386,13 +386,7 @@ failed:static void tc589_release (dev_link_t *link) { -DEBUG (0 ,"3c589_release(0x%p)\n" , link); - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int tc589_suspend (struct pcmcia_device *p_dev)
drivers/net/pcmcia/axnet_cs.c +1 -7
@@ -456,13 +456,7 @@ failed:static void axnet_release (dev_link_t *link) { -DEBUG (0 ,"axnet_release(0x%p)\n" , link); - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int axnet_suspend (struct pcmcia_device *p_dev)
drivers/net/pcmcia/com20020_cs.c +2 -10
@@ -377,16 +377,8 @@ failed:static void com20020_release (dev_link_t *link) { - -DEBUG (1 ,"release...\n" ); - -DEBUG (0 ,"com20020_release(0x%p)\n" , link); - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~(DEV_CONFIG |DEV_RELEASE_PENDING ); +DEBUG (0 ,"com20020_release(0x%p)\n" , link); +pcmcia_disable_device (link->handle); }static int com20020_suspend (struct pcmcia_device *p_dev)
drivers/net/pcmcia/fmvj18x_cs.c +2 -10
@@ -674,16 +674,8 @@ static int fmvj18x_setup_mfc(dev_link_tstatic void fmvj18x_release (dev_link_t *link) { - -DEBUG (0 ,"fmvj18x_release(0x%p)\n" , link); - -/* Don't bother checking to see if these succeed or not */ -pcmcia_release_window (link->win); -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +DEBUG (0 ,"fmvj18x_release(0x%p)\n" , link); +pcmcia_disable_device (link->handle); }static int fmvj18x_suspend (struct pcmcia_device *p_dev)
drivers/net/pcmcia/ibmtr_cs.c +9 -14
@@ -348,22 +348,17 @@ failed:static void ibmtr_release (dev_link_t *link) { -ibmtr_dev_t *info = link->priv; -struct net_device *dev = info->dev; - -DEBUG (0 ,"ibmtr_release(0x%p)\n" , link); +ibmtr_dev_t *info = link->priv; +struct net_device *dev = info->dev; -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); -if (link->win) { -struct tok_info *ti =netdev_priv (dev); -iounmap (ti->mmio); -pcmcia_release_window (link->win); -pcmcia_release_window (info->sram_win_handle); - } +DEBUG (0 ,"ibmtr_release(0x%p)\n" , link); - link->state &= ~DEV_CONFIG ; +if (link->win) { +struct tok_info *ti =netdev_priv (dev); +iounmap (ti->mmio); +pcmcia_release_window (info->sram_win_handle); + } +pcmcia_disable_device (link->handle); }static int ibmtr_suspend (struct pcmcia_device *p_dev)
drivers/net/pcmcia/nmclan_cs.c +2 -8
@@ -765,14 +765,8 @@ nmclan_release---------------------------------------------------------------------------- */ static void nmclan_release (dev_link_t *link) { - -DEBUG (0 ,"nmclan_release(0x%p)\n" , link); - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +DEBUG (0 ,"nmclan_release(0x%p)\n" , link); +pcmcia_disable_device (link->handle); }static int nmclan_suspend (struct pcmcia_device *p_dev)
drivers/net/pcmcia/pcnet_cs.c +5 -10
@@ -732,19 +732,14 @@ failed:static void pcnet_release (dev_link_t *link) { -pcnet_dev_t *info =PRIV (link->priv); +pcnet_dev_t *info =PRIV (link->priv); -DEBUG (0 ,"pcnet_release(0x%p)\n" , link); +DEBUG (0 ,"pcnet_release(0x%p)\n" , link); -if (info->flags &USE_SHMEM ) { -iounmap (info->base); -pcmcia_release_window (link->win); - } -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); +if (info->flags &USE_SHMEM ) +iounmap (info->base); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }/*======================================================================
drivers/net/pcmcia/smc91c92_cs.c +7 -14
@@ -1181,20 +1181,13 @@ config_failed: /* CS_EXIT_TEST() callsstatic void smc91c92_release (dev_link_t *link) { - -DEBUG (0 ,"smc91c92_release(0x%p)\n" , link); - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); -if (link->win) { -struct net_device *dev = link->priv; -struct smc_private *smc =netdev_priv (dev); -iounmap (smc->base); -pcmcia_release_window (link->win); - } - - link->state &= ~DEV_CONFIG ; +DEBUG (0 ,"smc91c92_release(0x%p)\n" , link); +if (link->win) { +struct net_device *dev = link->priv; +struct smc_private *smc =netdev_priv (dev); +iounmap (smc->base); + } +pcmcia_disable_device (link->handle); }/*======================================================================
drivers/net/pcmcia/xirc2ps_cs.c +8 -14
@@ -1090,21 +1090,15 @@ xirc2ps_config(dev_link_t * link)static void xirc2ps_release (dev_link_t *link) { +DEBUG (0 ,"release(0x%p)\n" , link); -DEBUG (0 ,"release(0x%p)\n" , link); - -if (link->win) { -struct net_device *dev = link->priv; -local_info_t *local =netdev_priv (dev); -if (local->dingo) -iounmap (local->dingo_ccr -0x0800 ); -pcmcia_release_window (link->win); - } -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; - +if (link->win) { +struct net_device *dev = link->priv; +local_info_t *local =netdev_priv (dev); +if (local->dingo) +iounmap (local->dingo_ccr -0x0800 ); + } +pcmcia_disable_device (link->handle); }/* xirc2ps_release */ /*====================================================================*/
drivers/net/wireless/airo_cs.c +1 -18
@@ -429,24 +429,7 @@ static void airo_config(dev_link_t *linkstatic void airo_release (dev_link_t *link) {DEBUG (0 ,"airo_release(0x%p)\n" , link); - -/* Unlink the device chain */ - link->dev =NULL ; - -/* -In a normal driver, additional code may be needed to release -other kernel data structures associated with this device. -*/ - -/* Don't bother checking to see if these succeed or not */ -if (link->win) -pcmcia_release_window (link->win); -pcmcia_release_configuration (link->handle); -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); -if (link->irq.AssignedIRQ) -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int airo_suspend (struct pcmcia_device *p_dev)
drivers/net/wireless/atmel_cs.c +6 -15
@@ -418,23 +418,14 @@ static void atmel_config(dev_link_t *linstatic void atmel_release (dev_link_t *link) {struct net_device *dev = ((local_info_t *)link->priv)->eth_dev; - +DEBUG (0 ,"atmel_release(0x%p)\n" , link); - -/* Unlink the device chain */ - link->dev =NULL ; - -if (dev) + +if (dev)stop_atmel_card (dev); - ((local_info_t *)link->priv)->eth_dev =NULL ; - -/* Don't bother checking to see if these succeed or not */ -pcmcia_release_configuration (link->handle); -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); -if (link->irq.AssignedIRQ) -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; + ((local_info_t *)link->priv)->eth_dev =NULL ; + +pcmcia_disable_device (link->handle); }static int atmel_suspend (struct pcmcia_device *dev)
drivers/net/wireless/hostap/hostap_cs.c +1 -10
@@ -804,16 +804,7 @@ static void prism2_release(u_long arg) iface->local->shutdown =1 ; } -if (link->win) -pcmcia_release_window (link->win); -pcmcia_release_configuration (link->handle); -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); -if (link->irq.AssignedIRQ) -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; - +pcmcia_disable_device (link->handle);PDEBUG (DEBUG_FLOW ,"release - done\n" ); }
drivers/net/wireless/netwave_cs.c +6 -13
@@ -869,21 +869,14 @@ failed:*/ static void netwave_release (dev_link_t *link) { -struct net_device *dev = link->priv; -netwave_private *priv =netdev_priv (dev); - -DEBUG (0 ,"netwave_release(0x%p)\n" , link); +struct net_device *dev = link->priv; +netwave_private *priv =netdev_priv (dev); -/* Don't bother checking to see if these succeed or not */ -if (link->win) { -iounmap (priv->ramBase); -pcmcia_release_window (link->win); - } -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); +DEBUG (0 ,"netwave_release(0x%p)\n" , link); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); +if (link->win) +iounmap (priv->ramBase); }static int netwave_suspend (struct pcmcia_device *p_dev)
drivers/net/wireless/orinoco_cs.c +1 -7
@@ -416,13 +416,7 @@ orinoco_cs_release(dev_link_t *link) priv->hw_unavailable++;spin_unlock_irqrestore (&priv->lock, flags); -/* Don't bother checking to see if these succeed or not */ -pcmcia_release_configuration (link->handle); -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); -if (link->irq.AssignedIRQ) -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle);if (priv->hw.iobase)ioport_unmap (priv->hw.iobase); }/* orinoco_cs_release */
drivers/net/wireless/spectrum_cs.c +1 -7
@@ -894,13 +894,7 @@ spectrum_cs_release(dev_link_t *link) priv->hw_unavailable++;spin_unlock_irqrestore (&priv->lock, flags); -/* Don't bother checking to see if these succeed or not */ -pcmcia_release_configuration (link->handle); -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); -if (link->irq.AssignedIRQ) -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle);if (priv->hw.iobase)ioport_unmap (priv->hw.iobase); }/* spectrum_cs_release */
drivers/net/wireless/wavelan_cs.c +6 -12
@@ -4098,24 +4098,18 @@ wv_pcmcia_config(dev_link_t * link)static void wv_pcmcia_release (dev_link_t *link) { -struct net_device * dev = (struct net_device *) link->priv; -net_local * lp =netdev_priv (dev); +struct net_device * dev = (struct net_device *) link->priv; +net_local * lp =netdev_priv (dev);#ifdef DEBUG_CONFIG_TRACE -printk (KERN_DEBUG "%s: -> wv_pcmcia_release(0x%p)\n" , dev->name, link); +printk (KERN_DEBUG "%s: -> wv_pcmcia_release(0x%p)\n" , dev->name, link);#endif -/* Don't bother checking to see if these succeed or not */ -iounmap (lp->mem); -pcmcia_release_window (link->win); -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +iounmap (lp->mem); +pcmcia_disable_device (link->handle);#ifdef DEBUG_CONFIG_TRACE -printk (KERN_DEBUG "%s: <- wv_pcmcia_release()\n" , dev->name); +printk (KERN_DEBUG "%s: <- wv_pcmcia_release()\n" , dev->name);#endif }
drivers/net/wireless/wl3501_cs.c +2 -8
@@ -2149,16 +2149,10 @@ static void wl3501_release(dev_link_t *lstruct net_device *dev = link->priv;/* Unlink the device chain */ -if (link->dev) { +if (link->dev)unregister_netdev (dev); - link->dev =NULL ; - } -/* Don't bother checking to see if these succeed or not */ -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int wl3501_suspend (struct pcmcia_device *p_dev)
drivers/parport/parport_cs.c +10 -16
@@ -267,23 +267,17 @@ failed:void parport_cs_release (dev_link_t *link) { -parport_info_t *info = link->priv; - -DEBUG (0 ,"parport_release(0x%p)\n" , link); - -if (info->ndev) { -struct parport *p = info->port; -parport_pc_unregister_port (p); - } - info->ndev =0 ; - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +parport_info_t *info = link->priv; +DEBUG (0 ,"parport_release(0x%p)\n" , link); + +if (info->ndev) { +struct parport *p = info->port; +parport_pc_unregister_port (p); + } + info->ndev =0 ; + +pcmcia_disable_device (link->handle); }/* parport_cs_release */ static int parport_suspend (struct pcmcia_device *dev)
drivers/pcmcia/pcmcia_resource.c +41 -30
115 lines not on this page · raw message
drivers/scsi/pcmcia/aha152x_stub.c +1 -7
@@ -248,13 +248,7 @@ static void aha152x_release_cs(dev_link_scsi_info_t *info = link->priv;aha152x_release (info->host); - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int aha152x_suspend (struct pcmcia_device *dev)
drivers/scsi/pcmcia/fdomain_stub.c +5 -12
@@ -209,20 +209,13 @@ cs_failed:static void fdomain_release (dev_link_t *link) { -scsi_info_t *info = link->priv; +scsi_info_t *info = link->priv; -DEBUG (0 ,"fdomain_release(0x%p)\n" , link); +DEBUG (0 ,"fdomain_release(0x%p)\n" , link); -scsi_remove_host (info->host); - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - -scsi_unregister (info->host); - - link->state &= ~DEV_CONFIG ; +scsi_remove_host (info->host); +pcmcia_disable_device (link->handle); +scsi_unregister (info->host); }/*====================================================================*/
drivers/scsi/pcmcia/nsp_cs.c +2 -9
@@ -1974,16 +1974,9 @@ static void nsp_cs_release(dev_link_t *lif (data !=NULL ) {iounmap ((void *)(data->MmioAddress)); } -pcmcia_release_window (link->win); } -pcmcia_release_configuration (link->handle); -if (link->io.NumPorts1) { -pcmcia_release_io (link->handle, &link->io); - } -if (link->irq.AssignedIRQ) { -pcmcia_release_irq (link->handle, &link->irq); - } - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,5 ,2 ))if (info->host !=NULL ) {scsi_host_put (info->host);
drivers/scsi/pcmcia/qlogic_stub.c +2 -7
@@ -289,6 +289,7 @@ out: cs_failed:cs_error (link->handle, last_fn, last_ret); link->dev =NULL ; +pcmcia_release_configuration (link->handle);pcmcia_release_io (link->handle, &link->io);pcmcia_release_irq (link->handle, &link->irq);
@@ -306,17 +307,11 @@ static void qlogic_release(dev_link_t *lDEBUG (0 ,"qlogic_release(0x%p)\n" , link);scsi_remove_host (info->host); - link->dev =NULL ;free_irq (link->irq.AssignedIRQ, info->host); - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); +pcmcia_disable_device (link->handle);scsi_host_put (info->host); - - link->state &= ~DEV_CONFIG ; }/*====================================================================*/
drivers/scsi/pcmcia/sym53c500_cs.c +1 -7
@@ -550,13 +550,7 @@ SYM53C500_release(dev_link_t *link)if (shost->io_port && shost->n_io_port)release_region (shost->io_port, shost->n_io_port); - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle);scsi_host_put (shost); }/* SYM53C500_release */
drivers/serial/serial_cs.c +2 -5
@@ -141,11 +141,8 @@ static void serial_remove(dev_link_t *li info->link.dev =NULL ; -if (!info->slave) { -pcmcia_release_configuration (info->link.handle); -pcmcia_release_io (info->link.handle, &info->link.io); -pcmcia_release_irq (info->link.handle, &info->link.irq); - } +if (!info->slave) +pcmcia_disable_device (link->handle); info->link.state &= ~DEV_CONFIG ; }
include/pcmcia/cs.h +2 -0
@@ -392,6 +392,8 @@ int pcmcia_eject_card(struct pcmcia_sockint pcmcia_insert_card (struct pcmcia_socket *skt);int pccard_reset_card (struct pcmcia_socket *skt); +void pcmcia_disable_device (struct pcmcia_device *p_dev); +struct pcmcia_socket *pcmcia_get_socket (struct pcmcia_socket *skt);void pcmcia_put_socket (struct pcmcia_socket *skt);
sound/pcmcia/pdaudiocf/pdaudiocf.c +1 -7
@@ -62,13 +62,7 @@ static void snd_pdacf_detach(struct pcmcstatic void pdacf_release (dev_link_t *link) { -if (link->state &DEV_CONFIG ) { -/* release cs resources */ -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; - } +pcmcia_disable_device (link->handle); }/*
sound/pcmcia/vx/vxpocket.c +1 -7
@@ -61,13 +61,7 @@ static unsigned int card_alloc;*/ static void vxpocket_release (dev_link_t *link) { -if (link->state &DEV_CONFIG ) { -/* release cs resources */ -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; - } +pcmcia_disable_device (link->handle); }/*
Signature · 1 line
1.2.4
Dominik Brodowski
maintainerPATCH 18/33 pcmcia: convert remaining users of pcmcia_release_io and _irq
In reply to Dominik BrodowskiConvert the remaining drivers which use pcmcia_release_io or pcmcia_release_irq, and remove the EXPORT of these symbols.
---
Documentation/pcmcia/driver-changes.txt | 4 ++-- drivers/isdn/hardware/avm/avm_cs.c | 10 +++++----- drivers/isdn/hisax/avma1_cs.c | 8 ++++---- drivers/isdn/hisax/sedlbauer_cs.c | 8 ++------ drivers/net/pcmcia/smc91c92_cs.c | 10 ++++++++-- drivers/net/wireless/orinoco_cs.c | 3 +-- drivers/net/wireless/ray_cs.c | 8 +------- drivers/net/wireless/spectrum_cs.c | 3 +-- drivers/pcmcia/pcmcia_resource.c | 3 --- drivers/scsi/pcmcia/nsp_cs.c | 5 +---- drivers/scsi/pcmcia/qlogic_stub.c | 7 +------ drivers/telephony/ixj_pcmcia.c | 5 +---- drivers/usb/host/sl811_cs.c | 14 ++------------ include/pcmcia/cs.h | 2 -- sound/pcmcia/pdaudiocf/pdaudiocf.c | 4 +--- sound/pcmcia/vx/vxpocket.c | 5 +---- 16 files changed, 31 insertions(+), 68 deletions(-)
50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7
Documentation/pcmcia/driver-changes.txt +2 -2
@@ -3,8 +3,8 @@ This file details changes in 2.6 which a * New release helper (as of 2.6.17) Instead of calling pcmcia_release_{configuration,io,irq,win}, all that's necessary now is calling pcmcia_disable_device. As there is no valid - reason left to call pcmcia_release_io and pcmcia_release_irq, they will - be removed soon. + reason left to call pcmcia_release_io and pcmcia_release_irq, the + exports for them were removed. * Unify detach and REMOVAL event code, as well as attach and INSERTION code (as of 2.6.16)
drivers/isdn/hardware/avm/avm_cs.c +5 -5
@@ -284,25 +284,25 @@ found_port:cs_error (link->handle, RequestIO, i);break ; } - +/* * allocate an interrupt line */ i =pcmcia_request_irq (link->handle, &link->irq);if (i !=CS_SUCCESS ) {cs_error (link->handle, RequestIRQ, i); -pcmcia_release_io (link->handle, &link->io); +/* undo */ +pcmcia_disable_device (link->handle);break ; } - +/* * configure the PCMCIA socket */ i =pcmcia_request_configuration (link->handle, &link->conf);if (i !=CS_SUCCESS ) {cs_error (link->handle, RequestConfiguration, i); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); +pcmcia_disable_device (link->handle);break ; }
drivers/isdn/hisax/avma1_cs.c +4 -4
@@ -313,18 +313,18 @@ found_port: i =pcmcia_request_irq (link->handle, &link->irq);if (i !=CS_SUCCESS ) {cs_error (link->handle, RequestIRQ, i); -pcmcia_release_io (link->handle, &link->io); +/* undo */ +pcmcia_disable_device (link->handle);break ; } - +/* * configure the PCMCIA socket */ i =pcmcia_request_configuration (link->handle, &link->conf);if (i !=CS_SUCCESS ) {cs_error (link->handle, RequestConfiguration, i); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); +pcmcia_disable_device (link->handle);break ; }
drivers/isdn/hisax/sedlbauer_cs.c +2 -6
@@ -374,15 +374,11 @@ static void sedlbauer_config(dev_link_t }/* If we got this far, we're cool! */ break ; - + next_entry: -/* new in dummy.cs 2001/01/28 MN -if (link->io.NumPorts1) -pcmcia_release_io(link->handle, &link->io); -*/ CS_CHECK (GetNextTuple,pcmcia_get_next_tuple (handle, &tuple)); } - +/* Allocate an interrupt line. Note that this does not assign a handler to the interrupt, unless the 'Handler' member of the
drivers/net/pcmcia/smc91c92_cs.c +8 -2
@@ -49,6 +49,7 @@#include <pcmcia/cisreg.h> #include <pcmcia/ciscode.h> #include <pcmcia/ds.h> +#include <pcmcia/ss.h> #include <asm/io.h> #include <asm/system.h>
@@ -965,10 +966,15 @@ static int check_sig(dev_link_t *link)if (width) {printk (KERN_INFO "smc91c92_cs: using 8-bit IO window.\n" ); +/* call pcmcia_release_configuration() in _suspend */ smc91c92_suspend (link->handle); -pcmcia_release_io (link->handle, &link->io); + link->io.Attributes1 =IO_DATA_PATH_WIDTH_8 ; -pcmcia_request_io (link->handle, &link->io); + link->handle->socket->io[0 ].res->flags &= ~IO_DATA_PATH_WIDTH ; + link->handle->socket->io[0 ].res->flags |=IO_DATA_PATH_WIDTH_8 ; + +/* call pcmcia_request_configuration() in _resume, it handles the +* flag update */ smc91c92_resume (link->handle);return check_sig (link); }
drivers/net/wireless/orinoco_cs.c +1 -2
@@ -317,8 +317,7 @@ orinoco_cs_config(dev_link_t *link)break ; next_entry: -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); +pcmcia_disable_device (handle); last_ret =pcmcia_get_next_tuple (handle, &tuple);if (last_ret ==CS_NO_MORE_ITEMS ) { printk(KERN_ERR PFX "GetNextTuple(): No matching "
drivers/net/wireless/ray_cs.c +1 -7
@@ -849,22 +849,16 @@ static void ray_release(dev_link_t *linkDEBUG (1 ,"ray_release(0x%p)\n" , link);del_timer (&local->timer); - link->state &= ~DEV_CONFIG ;iounmap (local->sram);iounmap (local->rmem);iounmap (local->amem);/* Do bother checking to see if these succeed or not */ - i =pcmcia_release_window (link->win); -if ( i !=CS_SUCCESS )DEBUG (0 ,"ReleaseWindow(link->win) ret = %x\n" ,i); i =pcmcia_release_window (local->amem_handle);if ( i !=CS_SUCCESS )DEBUG (0 ,"ReleaseWindow(local->amem) ret = %x\n" ,i); i =pcmcia_release_window (local->rmem_handle);if ( i !=CS_SUCCESS )DEBUG (0 ,"ReleaseWindow(local->rmem) ret = %x\n" ,i); - i =pcmcia_release_configuration (link->handle); -if ( i !=CS_SUCCESS )DEBUG (0 ,"ReleaseConfiguration ret = %x\n" ,i); - i =pcmcia_release_irq (link->handle, &link->irq); -if ( i !=CS_SUCCESS )DEBUG (0 ,"ReleaseIRQ ret = %x\n" ,i); +pcmcia_disable_device (link->handle);DEBUG (2 ,"ray_release ending\n" ); }
drivers/net/wireless/spectrum_cs.c +1 -2
@@ -790,8 +790,7 @@ spectrum_cs_config(dev_link_t *link)break ; next_entry: -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); +pcmcia_disable_device (handle); last_ret =pcmcia_get_next_tuple (handle, &tuple);if (last_ret ==CS_NO_MORE_ITEMS ) { printk(KERN_ERR PFX "GetNextTuple(): No matching "
drivers/pcmcia/pcmcia_resource.c +0 -3
@@ -514,7 +514,6 @@ int pcmcia_release_io(struct pcmcia_devireturn CS_SUCCESS ; }/* pcmcia_release_io */ -EXPORT_SYMBOL (pcmcia_release_io);int pcmcia_release_irq (struct pcmcia_device *p_dev,irq_req_t *req)
@@ -547,7 +546,6 @@ int pcmcia_release_irq(struct pcmcia_devreturn CS_SUCCESS ; }/* pcmcia_release_irq */ -EXPORT_SYMBOL (pcmcia_release_irq);int pcmcia_release_window (window_handle_t win)
@@ -937,6 +935,5 @@ void pcmcia_disable_device(struct pcmciapcmcia_release_window (p_dev->instance->win); p_dev->instance->dev =NULL ; - p_dev->instance->state &= ~DEV_CONFIG ; }EXPORT_SYMBOL (pcmcia_disable_device);
drivers/scsi/pcmcia/nsp_cs.c +1 -4
@@ -1802,10 +1802,7 @@ static void nsp_cs_config(dev_link_t *li next_entry:nsp_dbg (NSP_DEBUG_INIT ,"next" ); - -if (link->io.NumPorts1) { -pcmcia_release_io (link->handle, &link->io); - } +pcmcia_disable_device (handle);CS_CHECK (GetNextTuple,pcmcia_get_next_tuple (handle, &tuple)); }
drivers/scsi/pcmcia/qlogic_stub.c +1 -6
@@ -288,12 +288,7 @@ out: cs_failed:cs_error (link->handle, last_fn, last_ret); - link->dev =NULL ; - -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle);return ; }/* qlogic_config */
drivers/telephony/ixj_pcmcia.c +1 -4
@@ -229,10 +229,7 @@ static void ixj_cs_release(dev_link_t *lixj_info_t *info = link->priv;DEBUG (0 ,"ixj_cs_release(0x%p)\n" , link); info->ndev =0 ; - link->dev =NULL ; -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }static int ixj_suspend (struct pcmcia_device *dev)
drivers/usb/host/sl811_cs.c +2 -12
@@ -154,19 +154,10 @@ static void sl811_cs_detach(struct pcmcistatic void sl811_cs_release (dev_link_t * link) { -DBG (0 ,"sl811_cs_release(0x%p)\n" , link); -/* Unlink the device chain */ - link->dev =NULL ; - +pcmcia_disable_device (link->handle);platform_device_unregister (&platform_dev); -pcmcia_release_configuration (link->handle); -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); -if (link->irq.AssignedIRQ) -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; }static void sl811_cs_config (dev_link_t *link)
@@ -260,8 +251,7 @@ static void sl811_cs_config(dev_link_t *break ; next_entry: -if (link->io.NumPorts1) -pcmcia_release_io (link->handle, &link->io); +pcmcia_disable_device (handle); last_ret =pcmcia_get_next_tuple (handle, &tuple); }
include/pcmcia/cs.h +0 -2
@@ -379,8 +379,6 @@ int pcmcia_get_mem_page(window_handle_tint pcmcia_map_mem_page (window_handle_t win,memreq_t *req);int pcmcia_modify_configuration (struct pcmcia_device *p_dev,modconf_t *mod);int pcmcia_release_configuration (struct pcmcia_device *p_dev); -int pcmcia_release_io (struct pcmcia_device *p_dev,io_req_t *req); -int pcmcia_release_irq (struct pcmcia_device *p_dev,irq_req_t *req);int pcmcia_release_window (window_handle_t win);int pcmcia_request_configuration (struct pcmcia_device *p_dev,config_req_t *req);int pcmcia_request_io (struct pcmcia_device *p_dev,io_req_t *req);
sound/pcmcia/pdaudiocf/pdaudiocf.c +1 -3
@@ -273,9 +273,7 @@ static void pdacf_config(dev_link_t *lin cs_failed:cs_error (link->handle, last_fn, last_ret); failed: -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); +pcmcia_disable_device (link->handle); }#ifdef CONFIG_PM
sound/pcmcia/vx/vxpocket.c +1 -4
@@ -272,10 +272,7 @@ static void vxpocket_config(dev_link_t * cs_failed:cs_error (link->handle, last_fn, last_ret); failed: -pcmcia_release_configuration (link->handle); -pcmcia_release_io (link->handle, &link->io); -pcmcia_release_irq (link->handle, &link->irq); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle);kfree (parse); }
Signature · 1 line
1.2.4
Dominik Brodowski
maintainerPATCH 19/33 pcmcia: default suspend and resume handling
In reply to Dominik BrodowskiIn all but one case, the suspend and resume functions of PCMCIA drivers contain mostly of calls to pcmcia_release_configuration() and pcmcia_request_configuration(). Therefore, move this code out of the drivers and into the core.
---
drivers/bluetooth/bluecard_cs.c | 24 -------------------- drivers/bluetooth/bt3c_cs.c | 24 -------------------- drivers/bluetooth/btuart_cs.c | 25 -------------------- drivers/bluetooth/dtl1_cs.c | 24 -------------------- drivers/char/pcmcia/cm4000_cs.c | 9 ------- drivers/char/pcmcia/cm4040_cs.c | 24 -------------------- drivers/char/pcmcia/synclink_cs.c | 6 ----- drivers/ide/legacy/ide-cs.c | 23 ------------------- drivers/isdn/hardware/avm/avm_cs.c | 38 ------------------------------- drivers/isdn/hisax/avma1_cs.c | 26 +-------------------- drivers/isdn/hisax/elsa_cs.c | 6 ----- drivers/isdn/hisax/sedlbauer_cs.c | 6 ----- drivers/isdn/hisax/teles_cs.c | 6 ----- drivers/net/pcmcia/3c574_cs.c | 18 ++++----------- drivers/net/pcmcia/3c589_cs.c | 18 ++++----------- drivers/net/pcmcia/axnet_cs.c | 18 ++++----------- drivers/net/pcmcia/com20020_cs.c | 23 ++++++------------- drivers/net/pcmcia/fmvj18x_cs.c | 19 ++++------------ drivers/net/pcmcia/ibmtr_cs.c | 20 +++++----------- drivers/net/pcmcia/nmclan_cs.c | 19 ++++------------ drivers/net/pcmcia/pcnet_cs.c | 20 +++++----------- drivers/net/pcmcia/smc91c92_cs.c | 2 -- drivers/net/pcmcia/xirc2ps_cs.c | 16 +++---------- drivers/net/wireless/airo_cs.c | 9 ++----- drivers/net/wireless/atmel_cs.c | 7 +----- drivers/net/wireless/hostap/hostap_cs.c | 6 ----- drivers/net/wireless/netwave_cs.c | 18 ++++----------- drivers/net/wireless/orinoco_cs.c | 8 ------- drivers/net/wireless/ray_cs.c | 22 +++++------------- drivers/net/wireless/spectrum_cs.c | 7 ------ drivers/net/wireless/wavelan_cs.c | 24 +++++--------------- drivers/net/wireless/wl3501_cs.c | 18 ++++----------- drivers/parport/parport_cs.c | 23 ------------------- drivers/pcmcia/ds.c | 30 +++++++++++++++++++++--- drivers/scsi/pcmcia/aha152x_stub.c | 18 +-------------- drivers/scsi/pcmcia/fdomain_stub.c | 17 +------------- drivers/scsi/pcmcia/nsp_cs.c | 10 -------- drivers/scsi/pcmcia/qlogic_stub.c | 13 ----------- drivers/scsi/pcmcia/sym53c500_cs.c | 15 ------------ drivers/serial/serial_cs.c | 9 ++----- drivers/telephony/ixj_pcmcia.c | 24 -------------------- drivers/usb/host/sl811_cs.c | 24 -------------------- include/pcmcia/ds.h | 3 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 10 -------- sound/pcmcia/vx/vxpocket.c | 9 ------- 45 files changed, 105 insertions(+), 633 deletions(-)
8661bb5b4af1849c1f5a4e80c4e275fd13c155d6
drivers/bluetooth/bluecard_cs.c +0 -24
@@ -1005,28 +1005,6 @@ static void bluecard_release(dev_link_tpcmcia_disable_device (link->handle); } -static int bluecard_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int bluecard_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (DEV_OK (link)) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -} -static struct pcmcia_device_id bluecard_ids[] = {PCMCIA_DEVICE_PROD_ID12 ("BlueCard" ,"LSE041" ,0xbaf16fbf ,0x657cc15e ),PCMCIA_DEVICE_PROD_ID12 ("BTCFCARD" ,"LSE139" ,0xe3987764 ,0x2524b59c ),
@@ -1043,8 +1021,6 @@ static struct pcmcia_driver bluecard_dri .probe = bluecard_attach, .remove = bluecard_detach, .id_table = bluecard_ids, - .suspend = bluecard_suspend, - .resume = bluecard_resume, };static int __init init_bluecard_cs (void )
drivers/bluetooth/bt3c_cs.c +0 -24
@@ -842,28 +842,6 @@ static void bt3c_release(dev_link_t *linpcmcia_disable_device (link->handle); } -static int bt3c_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int bt3c_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (DEV_OK (link)) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -} -static struct pcmcia_device_id bt3c_ids[] = {PCMCIA_DEVICE_PROD_ID13 ("3COM" ,"Bluetooth PC Card" ,0xefce0a31 ,0xd4ce9b02 ),
@@ -879,8 +857,6 @@ static struct pcmcia_driver bt3c_driver .probe = bt3c_attach, .remove = bt3c_detach, .id_table = bt3c_ids, - .suspend = bt3c_suspend, - .resume = bt3c_resume, };static int __init init_bt3c_cs (void )
drivers/bluetooth/btuart_cs.c +0 -25
@@ -771,29 +771,6 @@ static void btuart_release(dev_link_t *lpcmcia_disable_device (link->handle); } -static int btuart_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int btuart_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (DEV_OK (link)) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -} - -static struct pcmcia_device_id btuart_ids[] = {/* don't use this driver. Use serial_cs + hci_uart instead */ PCMCIA_DEVICE_NULL
@@ -808,8 +785,6 @@ static struct pcmcia_driver btuart_drive .probe = btuart_attach, .remove = btuart_detach, .id_table = btuart_ids, - .suspend = btuart_suspend, - .resume = btuart_resume, };static int __init init_btuart_cs (void )
drivers/bluetooth/dtl1_cs.c +0 -24
@@ -723,28 +723,6 @@ static void dtl1_release(dev_link_t *linpcmcia_disable_device (link->handle); } -static int dtl1_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int dtl1_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (DEV_OK (link)) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -} -static struct pcmcia_device_id dtl1_ids[] = {PCMCIA_DEVICE_PROD_ID12 ("Nokia Mobile Phones" ,"DTL-1" ,0xe1bfdd64 ,0xe168480d ),
@@ -762,8 +740,6 @@ static struct pcmcia_driver dtl1_driver .probe = dtl1_attach, .remove = dtl1_detach, .id_table = dtl1_ids, - .suspend = dtl1_suspend, - .resume = dtl1_resume, };static int __init init_dtl1_cs (void )
drivers/char/pcmcia/cm4000_cs.c +0 -9
@@ -1870,10 +1870,6 @@ static int cm4000_suspend(struct pcmcia_struct cm4000_dev *dev; dev = link->priv; - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle);stop_monitor (dev);return 0 ;
@@ -1885,11 +1881,6 @@ static int cm4000_resume(struct pcmcia_dstruct cm4000_dev *dev; dev = link->priv; - - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open)start_monitor (dev);
drivers/char/pcmcia/cm4040_cs.c +0 -24
@@ -629,28 +629,6 @@ cs_release: link->state &= ~DEV_CONFIG_PENDING ; } -static int reader_suspend (struct pcmcia_device *p_dev) -{ -dev_link_t *link =dev_to_instance (p_dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int reader_resume (struct pcmcia_device *p_dev) -{ -dev_link_t *link =dev_to_instance (p_dev); - - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -} -static void reader_release (dev_link_t *link) {cm4040_reader_release (link->priv);
@@ -754,8 +732,6 @@ static struct pcmcia_driver reader_drive }, .probe = reader_attach, .remove = reader_detach, - .suspend = reader_suspend, - .resume = reader_resume, .id_table = cm4040_ids, };
drivers/char/pcmcia/synclink_cs.c +0 -6
@@ -733,10 +733,7 @@ static int mgslpc_suspend(struct pcmcia_dev_link_t *link =dev_to_instance (dev);MGSLPC_INFO *info = link->priv; - link->state |=DEV_SUSPEND ; info->stop =1 ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle);return 0 ; }
@@ -746,9 +743,6 @@ static int mgslpc_resume(struct pcmcia_ddev_link_t *link =dev_to_instance (dev);MGSLPC_INFO *info = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); info->stop =0 ;return 0 ;
drivers/ide/legacy/ide-cs.c +0 -23
@@ -373,27 +373,6 @@ void ide_release(dev_link_t *link)pcmcia_disable_device (link->handle); }/* ide_release */ -static int ide_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int ide_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (DEV_OK (link)) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -}/*======================================================================
@@ -456,8 +435,6 @@ static struct pcmcia_driver ide_cs_drive .probe = ide_attach, .remove = ide_detach, .id_table = ide_ids, - .suspend = ide_suspend, - .resume = ide_resume, };static int __init init_ide_cs (void )
drivers/isdn/hardware/avm/avm_cs.c +0 -38
@@ -371,42 +371,6 @@ static void avmcs_release(dev_link_t *lipcmcia_disable_device (link->handle); }/* avmcs_release */ -static int avmcs_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int avmcs_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -} - -/*====================================================================== - -The card status event handler. Mostly, this schedules other -stuff to run after an event is received. A CARD_REMOVAL event -also sets some flags to discourage the net drivers from trying -to talk to the card any more. - -When a CARD_REMOVAL event is received, we immediately set a flag -to block future accesses to this device. All the functions that -actually access the device should check this flag to make sure -the card is still present. -- ======================================================================*/ -static struct pcmcia_device_id avmcs_ids[] = {PCMCIA_DEVICE_PROD_ID12 ("AVM" ,"ISDN-Controller B1" ,0x95d42008 ,0x845dc335 ),
@@ -424,8 +388,6 @@ static struct pcmcia_driver avmcs_driver .probe = avmcs_attach, .remove = avmcs_detach, .id_table = avmcs_ids, - .suspend= avmcs_suspend, - .resume = avmcs_resume, };static int __init avmcs_init (void )
drivers/isdn/hisax/avma1_cs.c +1 -25
@@ -383,28 +383,6 @@ static void avma1cs_release(dev_link_t *pcmcia_disable_device (link->handle); }/* avma1cs_release */ -static int avma1cs_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int avma1cs_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -} -static struct pcmcia_device_id avma1cs_ids[] = {PCMCIA_DEVICE_PROD_ID12 ("AVM" ,"ISDN A" ,0x95d42008 ,0xadc9d4bb ),
@@ -421,10 +399,8 @@ static struct pcmcia_driver avma1cs_driv .probe = avma1cs_attach, .remove = avma1cs_detach, .id_table = avma1cs_ids, - .suspend = avma1cs_suspend, - .resume = avma1cs_resume, }; - +/*====================================================================*/ static int __init init_avma1_cs (void )
drivers/isdn/hisax/elsa_cs.c +0 -6
@@ -389,10 +389,7 @@ static int elsa_suspend(struct pcmcia_dedev_link_t *link =dev_to_instance (p_dev);local_info_t *dev = link->priv; - link->state |=DEV_SUSPEND ; dev->busy =1 ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle);return 0 ; }
@@ -402,9 +399,6 @@ static int elsa_resume(struct pcmcia_devdev_link_t *link =dev_to_instance (p_dev);local_info_t *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); dev->busy =0 ;return 0 ;
drivers/isdn/hisax/sedlbauer_cs.c +0 -6
@@ -472,10 +472,7 @@ static int sedlbauer_suspend(struct pcmcdev_link_t *link =dev_to_instance (p_dev);local_info_t *dev = link->priv; - link->state |=DEV_SUSPEND ; dev->stop =1 ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle);return 0 ; }
@@ -485,9 +482,6 @@ static int sedlbauer_resume(struct pcmcidev_link_t *link =dev_to_instance (p_dev);local_info_t *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); dev->stop =0 ;return 0 ;
drivers/isdn/hisax/teles_cs.c +0 -6
@@ -380,10 +380,7 @@ static int teles_suspend(struct pcmcia_ddev_link_t *link =dev_to_instance (p_dev);local_info_t *dev = link->priv; - link->state |=DEV_SUSPEND ; dev->busy =1 ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle);return 0 ; }
@@ -393,9 +390,6 @@ static int teles_resume(struct pcmcia_dedev_link_t *link =dev_to_instance (p_dev);local_info_t *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); dev->busy =0 ;return 0 ;
drivers/net/pcmcia/3c574_cs.c +5 -13
@@ -519,12 +519,8 @@ static int tc574_suspend(struct pcmcia_ddev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -534,13 +530,9 @@ static int tc574_resume(struct pcmcia_dedev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -tc574_reset (dev); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +tc574_reset (dev); +netif_device_attach (dev); }return 0 ;
drivers/net/pcmcia/3c589_cs.c +5 -13
@@ -394,12 +394,8 @@ static int tc589_suspend(struct pcmcia_ddev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -409,13 +405,9 @@ static int tc589_resume(struct pcmcia_dedev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -tc589_reset (dev); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +tc589_reset (dev); +netif_device_attach (dev); }return 0 ;
drivers/net/pcmcia/axnet_cs.c +5 -13
@@ -464,12 +464,8 @@ static int axnet_suspend(struct pcmcia_ddev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) +if ((link->state &DEV_CONFIG ) && (link->open))netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - }return 0 ; }
@@ -479,14 +475,10 @@ static int axnet_resume(struct pcmcia_dedev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -axnet_reset_8390 (dev); -AX88190_init (dev,1 ); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +axnet_reset_8390 (dev); +AX88190_init (dev,1 ); +netif_device_attach (dev); }return 0 ;
drivers/net/pcmcia/com20020_cs.c +7 -16
@@ -387,13 +387,8 @@ static int com20020_suspend(struct pcmcicom20020_dev_t *info = link->priv;struct net_device *dev = info->dev; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) { -netif_device_detach (dev); - } -pcmcia_release_configuration (link->handle); - } +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -404,15 +399,11 @@ static int com20020_resume(struct pcmciacom20020_dev_t *info = link->priv;struct net_device *dev = info->dev; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -int ioaddr = dev->base_addr; -struct arcnet_local *lp = dev->priv; -ARCRESET ; - } - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +int ioaddr = dev->base_addr; +struct arcnet_local *lp = dev->priv; +ARCRESET ; + }return 0 ; }
drivers/net/pcmcia/fmvj18x_cs.c +5 -14
@@ -683,13 +683,8 @@ static int fmvj18x_suspend(struct pcmciadev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } - +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -699,13 +694,9 @@ static int fmvj18x_resume(struct pcmcia_dev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -fjn_reset (dev); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +fjn_reset (dev); +netif_device_attach (dev); }return 0 ;
drivers/net/pcmcia/ibmtr_cs.c +6 -14
@@ -367,12 +367,8 @@ static int ibmtr_suspend(struct pcmcia_dibmtr_dev_t *info = link->priv;struct net_device *dev = info->dev; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -383,14 +379,10 @@ static int ibmtr_resume(struct pcmcia_deibmtr_dev_t *info = link->priv;struct net_device *dev = info->dev; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -ibmtr_probe (dev);/* really? */ -netif_device_attach (dev); - } - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +ibmtr_probe (dev);/* really? */ +netif_device_attach (dev); + }return 0 ; }
drivers/net/pcmcia/nmclan_cs.c +5 -14
@@ -774,13 +774,8 @@ static int nmclan_suspend(struct pcmcia_dev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } - +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -790,13 +785,9 @@ static int nmclan_resume(struct pcmcia_ddev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -nmclan_reset (dev); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +nmclan_reset (dev); +netif_device_attach (dev); }return 0 ;
drivers/net/pcmcia/pcnet_cs.c +6 -14
@@ -756,12 +756,8 @@ static int pcnet_suspend(struct pcmcia_ddev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -771,14 +767,10 @@ static int pcnet_resume(struct pcmcia_dedev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -pcnet_reset_8390 (dev); -NS8390_init (dev,1 ); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +pcnet_reset_8390 (dev); +NS8390_init (dev,1 ); +netif_device_attach (dev); }return 0 ;
drivers/net/pcmcia/smc91c92_cs.c +0 -2
@@ -874,7 +874,6 @@ static int smc91c92_suspend(struct pcmcidev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ;if (link->state &DEV_CONFIG ) {if (link->open)netif_device_detach (dev);
@@ -891,7 +890,6 @@ static int smc91c92_resume(struct pcmciastruct smc_private *smc =netdev_priv (dev);int i; - link->state &= ~DEV_SUSPEND ;if (link->state &DEV_CONFIG ) {if ((smc->manfid ==MANFID_MEGAHERTZ ) && (smc->cardid ==PRODID_MEGAHERTZ_EM3288 ))
drivers/net/pcmcia/xirc2ps_cs.c +4 -12
@@ -1109,13 +1109,9 @@ static int xirc2ps_suspend(struct pcmciadev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) { +if ((link->state &DEV_CONFIG ) && (link->open)) {netif_device_detach (dev);do_powerdown (dev); - } -pcmcia_release_configuration (link->handle); }return 0 ;
@@ -1126,13 +1122,9 @@ static int xirc2ps_resume(struct pcmcia_dev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -do_reset (dev,1 ); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +do_reset (dev,1 ); +netif_device_attach (dev); }return 0 ;
drivers/net/wireless/airo_cs.c +2 -7
@@ -437,11 +437,8 @@ static int airo_suspend(struct pcmcia_dedev_link_t *link =dev_to_instance (p_dev);local_info_t *local = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { +if (link->state &DEV_CONFIG )netif_device_detach (local->eth_dev); -pcmcia_release_configuration (link->handle); - }return 0 ; }
@@ -451,9 +448,7 @@ static int airo_resume(struct pcmcia_devdev_link_t *link =dev_to_instance (p_dev);local_info_t *local = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); +if ((link->state &DEV_CONFIG ) && (link->open)) {reset_airo_card (local->eth_dev);netif_device_attach (local->eth_dev); }
drivers/net/wireless/atmel_cs.c +1 -6
@@ -433,11 +433,8 @@ static int atmel_suspend(struct pcmcia_ddev_link_t *link =dev_to_instance (dev);local_info_t *local = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { +if (link->state &DEV_CONFIG )netif_device_detach (local->eth_dev); -pcmcia_release_configuration (link->handle); - }return 0 ; }
@@ -447,9 +444,7 @@ static int atmel_resume(struct pcmcia_dedev_link_t *link =dev_to_instance (dev);local_info_t *local = link->priv; - link->state &= ~DEV_SUSPEND ;if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf);atmel_open (local->eth_dev);netif_device_attach (local->eth_dev); }
drivers/net/wireless/hostap/hostap_cs.c +0 -6
@@ -816,8 +816,6 @@ static int hostap_cs_suspend(struct pcmcPDEBUG (DEBUG_EXTRA ,"%s: CS_EVENT_PM_SUSPEND\n" , dev_info); - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) {struct hostap_interface *iface =netdev_priv (dev);if (iface && iface->local)
@@ -827,7 +825,6 @@ static int hostap_cs_suspend(struct pcmcnetif_device_detach (dev); }prism2_suspend (dev); -pcmcia_release_configuration (link->handle); }return 0 ;
@@ -841,14 +838,11 @@ static int hostap_cs_resume(struct pcmciPDEBUG (DEBUG_EXTRA ,"%s: CS_EVENT_PM_RESUME\n" , dev_info); - link->state &= ~DEV_SUSPEND ;if (link->state &DEV_CONFIG ) {struct hostap_interface *iface =netdev_priv (dev);if (iface && iface->local) dev_open = iface->local->num_dev_open >0 ; -pcmcia_request_configuration (link->handle, &link->conf); -prism2_hw_shutdown (dev,1 );prism2_hw_config (dev, dev_open ?0 :1 );if (dev_open) {
drivers/net/wireless/netwave_cs.c +5 -13
@@ -884,12 +884,8 @@ static int netwave_suspend(struct pcmciadev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -899,13 +895,9 @@ static int netwave_resume(struct pcmcia_dev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -netwave_reset (dev); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +netwave_reset (dev); +netif_device_attach (dev); }return 0 ;
drivers/net/wireless/orinoco_cs.c +0 -8
@@ -429,7 +429,6 @@ static int orinoco_cs_suspend(struct pcmint err =0 ;unsigned long flags; - link->state |=DEV_SUSPEND ;if (link->state &DEV_CONFIG ) {/* This is probably racy, but I can't think of a better way, short of rewriting the PCMCIA
@@ -447,8 +446,6 @@ static int orinoco_cs_suspend(struct pcmspin_unlock_irqrestore (&priv->lock, flags); } - -pcmcia_release_configuration (link->handle); }return 0 ;
@@ -463,12 +460,7 @@ static int orinoco_cs_resume(struct pcmcint err =0 ;unsigned long flags; - link->state &= ~DEV_SUSPEND ;if (link->state &DEV_CONFIG ) { -/* FIXME: should we double check that this is -* the same card as we had before */ -pcmcia_request_configuration (link->handle, &link->conf); -if (!test_bit (0 , &card->hard_reset_in_progress)) { err =orinoco_reinit_firmware (dev);if (err) {
drivers/net/wireless/ray_cs.c +6 -16
@@ -868,14 +868,8 @@ static int ray_suspend(struct pcmcia_devdev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); - -pcmcia_release_configuration (link->handle); - } - +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -885,14 +879,10 @@ static int ray_resume(struct pcmcia_devidev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -ray_reset (dev); -netif_device_attach (dev); - } - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +ray_reset (dev); +netif_device_attach (dev); + }return 0 ; }
drivers/net/wireless/spectrum_cs.c +0 -7
@@ -908,7 +908,6 @@ spectrum_cs_suspend(struct pcmcia_deviceunsigned long flags;int err =0 ; - link->state |=DEV_SUSPEND ;/* Mark the device as stopped, to block IO until later */ if (link->state &DEV_CONFIG ) {spin_lock_irqsave (&priv->lock, flags);
@@ -922,8 +921,6 @@ spectrum_cs_suspend(struct pcmcia_device priv->hw_unavailable++;spin_unlock_irqrestore (&priv->lock, flags); - -pcmcia_release_configuration (link->handle); }return 0 ;
@@ -936,11 +933,7 @@ spectrum_cs_resume(struct pcmcia_devicestruct net_device *dev = link->priv;struct orinoco_private *priv =netdev_priv (dev); - link->state &= ~DEV_SUSPEND ;if (link->state &DEV_CONFIG ) { -/* FIXME: should we double check that this is -* the same card as we had before */ -pcmcia_request_configuration (link->handle, &link->conf);netif_device_attach (dev); priv->hw_unavailable--;schedule_work (&priv->reset_work);
drivers/net/wireless/wavelan_cs.c +6 -18
@@ -4742,19 +4742,12 @@ static int wavelan_suspend(struct pcmcia/* Stop receiving new messages and wait end of transmission */ wv_ru_stop (dev); +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev); +/* Power down the module */ hacr_write (dev->base_addr,HACR_DEFAULT & (~HACR_PWR_STAT )); -/* The card is now suspended */ - link->state |=DEV_SUSPEND ; - -if (link->state &DEV_CONFIG ) - { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } -return 0 ; }
@@ -4764,14 +4757,9 @@ static int wavelan_resume(struct pcmcia_struct net_device * dev = (struct net_device *) link->priv; link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) - { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open)/* If RESET -> True, If RESUME -> False ? */ - { -wv_hw_reset (dev); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +wv_hw_reset (dev); +netif_device_attach (dev); }return 0 ;
drivers/net/wireless/wl3501_cs.c +5 -13
@@ -2160,14 +2160,9 @@ static int wl3501_suspend(struct pcmcia_dev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; - link->state |=DEV_SUSPEND ; -wl3501_pwr_mgmt (dev->priv,WL3501_SUSPEND ); -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -2178,12 +2173,9 @@ static int wl3501_resume(struct pcmcia_dstruct net_device *dev = link->priv;wl3501_pwr_mgmt (dev->priv,WL3501_RESUME ); -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -if (link->open) { -wl3501_reset (dev); -netif_device_attach (dev); - } +if ((link->state &DEV_CONFIG ) && (link->open)) { +wl3501_reset (dev); +netif_device_attach (dev); }return 0 ;
drivers/parport/parport_cs.c +0 -23
@@ -280,27 +280,6 @@ void parport_cs_release(dev_link_t *linkpcmcia_disable_device (link->handle); }/* parport_cs_release */ -static int parport_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int parport_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (DEV_OK (link)) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -}static struct pcmcia_device_id parport_ids[] = {PCMCIA_DEVICE_FUNC_ID (3 ),
@@ -317,8 +296,6 @@ static struct pcmcia_driver parport_cs_d .probe = parport_attach, .remove = parport_detach, .id_table = parport_ids, - .suspend = parport_suspend, - .resume = parport_resume, };static int __init init_parport_cs (void )
drivers/pcmcia/ds.c +26 -4
@@ -10,7 +10,7 @@* are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * * (C) 1999 David A. Hinds -* (C) 2003 - 2005 Dominik Brodowski +* (C) 2003 - 2006 Dominik Brodowski */ #include <linux/kernel.h>
@@ -1030,12 +1030,22 @@ static int pcmcia_dev_suspend(struct dev {struct pcmcia_device *p_dev =to_pcmcia_dev (dev);struct pcmcia_driver *p_drv =NULL ; +int ret;if (dev->driver) p_drv =to_pcmcia_drv (dev->driver); -if (p_drv && p_drv->suspend) -return p_drv->suspend (p_dev); +if (p_drv && p_drv->suspend) { + ret = p_drv->suspend (p_dev); +if (ret) +return ret; +if (p_dev->instance) { + p_dev->instance->state |=DEV_SUSPEND ; +if ((p_dev->instance->state &DEV_CONFIG ) && + !(p_dev->instance->state &DEV_SUSPEND_NORELEASE )) +pcmcia_release_configuration (p_dev); + } + }return 0 ; }
@@ -1045,12 +1055,24 @@ static int pcmcia_dev_resume(struct devi {struct pcmcia_device *p_dev =to_pcmcia_dev (dev);struct pcmcia_driver *p_drv =NULL ; +int ret;if (dev->driver) p_drv =to_pcmcia_drv (dev->driver); -if (p_drv && p_drv->resume) +if (p_drv && p_drv->resume) { +if (p_dev->instance) { + p_dev->instance->state &= ~DEV_SUSPEND ; +if ((p_dev->instance->state &DEV_CONFIG ) && + !(p_dev->instance->state &DEV_SUSPEND_NORELEASE )){ + ret =pcmcia_request_configuration (p_dev, + &p_dev->instance->conf); +if (ret) +return ret; + } + }return p_drv->resume (p_dev); + }return 0 ; }
drivers/scsi/pcmcia/aha152x_stub.c +1 -17
@@ -251,27 +251,12 @@ static void aha152x_release_cs(dev_link_pcmcia_disable_device (link->handle); } -static int aha152x_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} -static int aha152x_resume (struct pcmcia_device *dev) {dev_link_t *link =dev_to_instance (dev);scsi_info_t *info = link->priv; - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -aha152x_host_reset_host (info->host); - } +aha152x_host_reset_host (info->host);return 0 ; }
@@ -294,7 +279,6 @@ static struct pcmcia_driver aha152x_cs_d .probe = aha152x_attach, .remove = aha152x_detach, .id_table = aha152x_ids, - .suspend = aha152x_suspend, .resume = aha152x_resume, };
drivers/scsi/pcmcia/fdomain_stub.c +1 -16
@@ -220,26 +220,12 @@ static void fdomain_release(dev_link_t */*====================================================================*/ -static int fdomain_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} -static int fdomain_resume (struct pcmcia_device *dev) {dev_link_t *link =dev_to_instance (dev); - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); +if (link->state &DEV_CONFIG )fdomain_16x0_bus_reset (NULL ); - }return 0 ; }
@@ -260,7 +246,6 @@ static struct pcmcia_driver fdomain_cs_d .probe = fdomain_attach, .remove = fdomain_detach, .id_table = fdomain_ids, - .suspend = fdomain_suspend, .resume = fdomain_resume, };
drivers/scsi/pcmcia/nsp_cs.c +0 -10
@@ -1987,8 +1987,6 @@ static int nsp_cs_suspend(struct pcmcia_scsi_info_t *info = link->priv;nsp_hw_data *data; - link->state |=DEV_SUSPEND ; -nsp_dbg (NSP_DEBUG_INIT ,"event: suspend" );if (info->host !=NULL ) {
@@ -2001,9 +1999,6 @@ static int nsp_cs_suspend(struct pcmcia_ info->stop =1 ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); -return 0 ; }
@@ -2015,11 +2010,6 @@ static int nsp_cs_resume(struct pcmcia_dnsp_dbg (NSP_DEBUG_INIT ,"event: resume" ); - link->state &= ~DEV_SUSPEND ; - -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); - info->stop =0 ;if (info->host !=NULL ) {
drivers/scsi/pcmcia/qlogic_stub.c +0 -13
@@ -311,22 +311,10 @@ static void qlogic_release(dev_link_t *l/*====================================================================*/ -static int qlogic_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} -static int qlogic_resume (struct pcmcia_device *dev) {dev_link_t *link =dev_to_instance (dev); - link->state &= ~DEV_SUSPEND ;if (link->state &DEV_CONFIG ) {scsi_info_t *info = link->priv;
@@ -375,7 +363,6 @@ static struct pcmcia_driver qlogic_cs_dr .probe = qlogic_attach, .remove = qlogic_detach, .id_table = qlogic_ids, - .suspend = qlogic_suspend, .resume = qlogic_resume, };
drivers/scsi/pcmcia/sym53c500_cs.c +0 -15
@@ -857,26 +857,12 @@ cs_failed:return ; }/* SYM53C500_config */ -static int sym53c500_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} -static int sym53c500_resume (struct pcmcia_device *dev) {dev_link_t *link =dev_to_instance (dev);struct scsi_info_t *info = link->priv; - link->state &= ~DEV_SUSPEND ;if (link->state &DEV_CONFIG ) { -pcmcia_request_configuration (link->handle, &link->conf); -/* See earlier comment about manufacturer IDs. */ if ((info->manf_id == MANFID_MACNICA) || (info->manf_id == MANFID_PIONEER) ||
@@ -963,7 +949,6 @@ static struct pcmcia_driver sym53c500_cs .probe = SYM53C500_attach, .remove = SYM53C500_detach, .id_table = sym53c500_ids, - .suspend = sym53c500_suspend, .resume = sym53c500_resume, };
drivers/serial/serial_cs.c +2 -7
@@ -151,7 +151,6 @@ static void serial_remove(dev_link_t *listatic int serial_suspend (struct pcmcia_device *dev) {dev_link_t *link =dev_to_instance (dev); - link->state |=DEV_SUSPEND ;if (link->state &DEV_CONFIG ) {struct serial_info *info = link->priv;
@@ -160,8 +159,8 @@ static int serial_suspend(struct pcmcia_for (i =0 ; i < info->ndev; i++)serial8250_suspend_port (info->line[i]); -if (!info->slave) -pcmcia_release_configuration (link->handle); +if (info->slave) + link->state &=DEV_SUSPEND_NORELEASE ; }return 0 ;
@@ -170,15 +169,11 @@ static int serial_suspend(struct pcmcia_static int serial_resume (struct pcmcia_device *dev) {dev_link_t *link =dev_to_instance (dev); - link->state &= ~DEV_SUSPEND ;if (DEV_OK (link)) {struct serial_info *info = link->priv;int i; -if (!info->slave) -pcmcia_request_configuration (link->handle, &link->conf); -for (i =0 ; i < info->ndev; i++)serial8250_resume_port (info->line[i]); }
drivers/telephony/ixj_pcmcia.c +0 -24
@@ -232,28 +232,6 @@ static void ixj_cs_release(dev_link_t *lpcmcia_disable_device (link->handle); } -static int ixj_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int ixj_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (DEV_OK (link)) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -} -static struct pcmcia_device_id ixj_ids[] = {PCMCIA_DEVICE_MANF_CARD (0x0257 ,0x0600 ),PCMCIA_DEVICE_NULL
@@ -268,8 +246,6 @@ static struct pcmcia_driver ixj_driver = .probe = ixj_attach, .remove = ixj_detach, .id_table = ixj_ids, - .suspend = ixj_suspend, - .resume = ixj_resume, };static int __init ixj_pcmcia_init (void )
drivers/usb/host/sl811_cs.c +0 -24
@@ -293,28 +293,6 @@ cs_failed: } } -static int sl811_suspend (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state |=DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); - -return 0 ; -} - -static int sl811_resume (struct pcmcia_device *dev) -{ -dev_link_t *link =dev_to_instance (dev); - - link->state &= ~DEV_SUSPEND ; -if (link->state &DEV_CONFIG ) -pcmcia_request_configuration (link->handle, &link->conf); - -return 0 ; -} -static int sl811_cs_attach (struct pcmcia_device *p_dev) {local_info_t *local;
@@ -359,8 +337,6 @@ static struct pcmcia_driver sl811_cs_dri .probe = sl811_cs_attach, .remove = sl811_cs_detach, .id_table = sl811_ids, - .suspend = sl811_suspend, - .resume = sl811_resume, };/*====================================================================*/
include/pcmcia/ds.h +1 -2
@@ -118,8 +118,7 @@ typedef struct dev_link_t {/* Flags for device state */ #define DEV_PRESENT 0x01#define DEV_CONFIG 0x02 -#define DEV_STALE_CONFIG 0x04/* release on close */ -#define DEV_STALE_LINK 0x08/* detach on release */ +#define DEV_SUSPEND_NORELEASE 0x04#define DEV_CONFIG_PENDING 0x10#define DEV_RELEASE_PENDING 0x20#define DEV_SUSPEND 0x40
sound/pcmcia/pdaudiocf/pdaudiocf.c +0 -10
@@ -284,16 +284,11 @@ static int pdacf_suspend(struct pcmcia_dstruct snd_pdacf *chip = link->priv;snd_printdd (KERN_DEBUG "SUSPEND\n" ); - link->state |=DEV_SUSPEND ;if (chip) {snd_printdd (KERN_DEBUG "snd_pdacf_suspend calling\n" );snd_pdacf_suspend (chip,PMSG_SUSPEND ); } -snd_printdd (KERN_DEBUG "RESET_PHYSICAL\n" ); -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle); -return 0 ; }
@@ -303,12 +298,7 @@ static int pdacf_resume(struct pcmcia_destruct snd_pdacf *chip = link->priv;snd_printdd (KERN_DEBUG "RESUME\n" ); - link->state &= ~DEV_SUSPEND ; - -snd_printdd (KERN_DEBUG "CARD_RESET\n" );if (DEV_OK (link)) { -snd_printdd (KERN_DEBUG "requestconfig...\n" ); -pcmcia_request_configuration (link->handle, &link->conf);if (chip) {snd_printdd (KERN_DEBUG "calling snd_pdacf_resume\n" );snd_pdacf_resume (chip);
sound/pcmcia/vx/vxpocket.c +0 -9
@@ -284,14 +284,10 @@ static int vxp_suspend(struct pcmcia_devstruct vx_core *chip = link->priv;snd_printdd (KERN_DEBUG "SUSPEND\n" ); - link->state |=DEV_SUSPEND ;if (chip) {snd_printdd (KERN_DEBUG "snd_vx_suspend calling\n" );snd_vx_suspend (chip,PMSG_SUSPEND ); } -snd_printdd (KERN_DEBUG "RESET_PHYSICAL\n" ); -if (link->state &DEV_CONFIG ) -pcmcia_release_configuration (link->handle);return 0 ; }
@@ -302,13 +298,8 @@ static int vxp_resume(struct pcmcia_devistruct vx_core *chip = link->priv;snd_printdd (KERN_DEBUG "RESUME\n" ); - link->state &= ~DEV_SUSPEND ; - -snd_printdd (KERN_DEBUG "CARD_RESET\n" );if (DEV_OK (link)) {//struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip; -snd_printdd (KERN_DEBUG "requestconfig...\n" ); -pcmcia_request_configuration (link->handle, &link->conf);if (chip) {snd_printdd (KERN_DEBUG "calling snd_vx_resume\n" );snd_vx_resume (chip);
Signature · 1 line
1.2.4
Dominik Brodowski
maintainerPATCH 20/33 pcmcia: remove export of pcmcia_release_configuration
In reply to Dominik BrodowskiHandle the _modifying_ operation sm91c92_cs requires in pcmcia_modify_configuration, so that the only remaining users of pcmcia_release_configuration() are within the pcmcia core module.
---
drivers/mtd/maps/pcmciamtd.c | 3 +-- drivers/net/pcmcia/smc91c92_cs.c | 29 +++++++++++------------------ drivers/pcmcia/ds_internal.h | 2 ++ drivers/pcmcia/pcmcia_resource.c | 23 ++++++++++++++++++++++- include/pcmcia/cs.h | 10 +++++----- 5 files changed, 41 insertions(+), 26 deletions(-)
4bbed5231468014b500b048d7370a1c6c349231a
drivers/mtd/maps/pcmciamtd.c +1 -2
@@ -353,8 +353,7 @@ static void pcmciamtd_release(dev_link_t }pcmcia_release_window (link->win); } -pcmcia_release_configuration (link->handle); - link->state &= ~DEV_CONFIG ; +pcmcia_disable_device (link->handle); }
drivers/net/pcmcia/smc91c92_cs.c +11 -18
@@ -874,11 +874,8 @@ static int smc91c92_suspend(struct pcmcidev_link_t *link =dev_to_instance (p_dev);struct net_device *dev = link->priv; -if (link->state &DEV_CONFIG ) { -if (link->open) -netif_device_detach (dev); -pcmcia_release_configuration (link->handle); - } +if ((link->state &DEV_CONFIG ) && (link->open)) +netif_device_detach (dev);return 0 ; }
@@ -894,7 +891,6 @@ static int smc91c92_resume(struct pcmciaif ((smc->manfid ==MANFID_MEGAHERTZ ) && (smc->cardid ==PRODID_MEGAHERTZ_EM3288 ))mhz_3288_power (link); -pcmcia_request_configuration (link->handle, &link->conf);if (smc->manfid ==MANFID_MOTOROLA )mot_config (link); if ((smc->manfid == MANFID_OSITECH) &&
@@ -963,18 +959,15 @@ static int check_sig(dev_link_t *link) }if (width) { -printk (KERN_INFO "smc91c92_cs: using 8-bit IO window.\n" ); -/* call pcmcia_release_configuration() in _suspend */ -smc91c92_suspend (link->handle); - - link->io.Attributes1 =IO_DATA_PATH_WIDTH_8 ; - link->handle->socket->io[0 ].res->flags &= ~IO_DATA_PATH_WIDTH ; - link->handle->socket->io[0 ].res->flags |=IO_DATA_PATH_WIDTH_8 ; - -/* call pcmcia_request_configuration() in _resume, it handles the -* flag update */ -smc91c92_resume (link->handle); -return check_sig (link); +modconf_t mod = { + .Attributes =CONF_IO_CHANGE_WIDTH , + }; +printk (KERN_INFO "smc91c92_cs: using 8-bit IO window.\n" ); + +smc91c92_suspend (link->handle); +pcmcia_modify_configuration (link->handle, &mod); +smc91c92_resume (link->handle); +return check_sig (link); }return -ENODEV ; }
drivers/pcmcia/ds_internal.h +2 -0
@@ -8,6 +8,8 @@ extern void pcmcia_put_dev(struct pcmciastruct pcmcia_device *pcmcia_device_add (struct pcmcia_socket *s,unsigned int function); +extern int pcmcia_release_configuration (struct pcmcia_device *p_dev); +#ifdef CONFIG_PCMCIA_IOCTL extern void __init pcmcia_setup_ioctl (void ); extern void __exit pcmcia_cleanup_ioctl(void);
drivers/pcmcia/pcmcia_resource.c +22 -1
@@ -442,6 +442,28 @@ int pcmcia_modify_configuration(struct p (mod->Attributes & CONF_VPP2_CHANGE_VALID))return CS_BAD_VPP ; +if (mod->Attributes &CONF_IO_CHANGE_WIDTH ) { +pccard_io_map io_off = {0 ,0 ,0 ,0 ,1 }; +pccard_io_map io_on; +int i; + + io_on.speed = io_speed; +for (i =0 ; i <MAX_IO_WIN ; i++) { +if (!s->io[i].res) +continue ; + io_off.map = i; + io_on.map = i; + + io_on.flags =MAP_ACTIVE |IO_DATA_PATH_WIDTH_8 ; + io_on.start = s->io[i].res->start; + io_on.stop = s->io[i].res->end; + + s->ops->set_io_map (s, &io_off); +mdelay (40 ); + s->ops->set_io_map (s, &io_on); + } + } +return CS_SUCCESS ; }/* modify_configuration */ EXPORT_SYMBOL (pcmcia_modify_configuration);
@@ -479,7 +501,6 @@ int pcmcia_release_configuration(structreturn CS_SUCCESS ; }/* pcmcia_release_configuration */ -EXPORT_SYMBOL (pcmcia_release_configuration);/** pcmcia_release_io
include/pcmcia/cs.h +5 -5
@@ -116,10 +116,11 @@ typedef struct modconf_t { } modconf_t;/* Attributes for ModifyConfiguration */ -#define CONF_IRQ_CHANGE_VALID 0x100 -#define CONF_VCC_CHANGE_VALID 0x200 -#define CONF_VPP1_CHANGE_VALID 0x400 -#define CONF_VPP2_CHANGE_VALID 0x800 +#define CONF_IRQ_CHANGE_VALID 0x0100 +#define CONF_VCC_CHANGE_VALID 0x0200 +#define CONF_VPP1_CHANGE_VALID 0x0400 +#define CONF_VPP2_CHANGE_VALID 0x0800 +#define CONF_IO_CHANGE_WIDTH 0x1000/* For RequestConfiguration */ typedef struct config_req_t {
@@ -378,7 +379,6 @@ int pcmcia_get_status(struct pcmcia_deviint pcmcia_get_mem_page (window_handle_t win,memreq_t *req);int pcmcia_map_mem_page (window_handle_t win,memreq_t *req);int pcmcia_modify_configuration (struct pcmcia_device *p_dev,modconf_t *mod); -int pcmcia_release_configuration (struct pcmcia_device *p_dev);int pcmcia_release_window (window_handle_t win);int pcmcia_request_configuration (struct pcmcia_device *p_dev,config_req_t *req);int pcmcia_request_io (struct pcmcia_device *p_dev,io_req_t *req);
Signature · 6 lines
1.2.4 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Dominik Brodowski
maintainerPATCH 21/33 pcmcia: remove unneeded Vcc pseudo setting
In reply to Dominik BrodowskiAs we do not allow setting Vcc in the pcmcia core, and Vpp1 and Vpp2 can only be set to the same value, a lot of code can be streamlined.
---
drivers/bluetooth/bluecard_cs.c | 4 ---- drivers/bluetooth/bt3c_cs.c | 6 +----- drivers/bluetooth/btuart_cs.c | 6 +----- drivers/bluetooth/dtl1_cs.c | 4 ---- drivers/char/pcmcia/cm4000_cs.c | 7 ------- drivers/char/pcmcia/cm4040_cs.c | 7 ------- drivers/char/pcmcia/synclink_cs.c | 7 ------- drivers/ide/legacy/ide-cs.c | 11 ++++------- drivers/isdn/hardware/avm/avm_cs.c | 1 - drivers/isdn/hisax/avma1_cs.c | 1 - drivers/isdn/hisax/elsa_cs.c | 8 ++------ drivers/isdn/hisax/sedlbauer_cs.c | 16 ++++++---------- drivers/isdn/hisax/teles_cs.c | 8 ++------ drivers/mtd/maps/pcmciamtd.c | 7 ++----- drivers/net/pcmcia/3c574_cs.c | 1 - drivers/net/pcmcia/3c589_cs.c | 1 - drivers/net/pcmcia/axnet_cs.c | 5 ----- drivers/net/pcmcia/com20020_cs.c | 1 - drivers/net/pcmcia/fmvj18x_cs.c | 8 +------- drivers/net/pcmcia/ibmtr_cs.c | 1 - drivers/net/pcmcia/nmclan_cs.c | 1 - drivers/net/pcmcia/pcnet_cs.c | 5 ----- drivers/net/pcmcia/smc91c92_cs.c | 1 - drivers/net/pcmcia/xirc2ps_cs.c | 1 - drivers/net/wireless/airo_cs.c | 19 ++++++------------- drivers/net/wireless/atmel_cs.c | 10 ++-------- drivers/net/wireless/hostap/hostap_cs.c | 19 +++++++------------ drivers/net/wireless/netwave_cs.c | 1 - drivers/net/wireless/orinoco_cs.c | 18 ++++++++---------- drivers/net/wireless/ray_cs.c | 1 - drivers/net/wireless/spectrum_cs.c | 16 +++++++--------- drivers/net/wireless/wavelan_cs.c | 1 - drivers/net/wireless/wl3501_cs.c | 1 - drivers/parport/parport_cs.c | 5 ----- drivers/pcmcia/pcmcia_resource.c | 6 +----- drivers/scsi/pcmcia/aha152x_stub.c | 1 - drivers/scsi/pcmcia/fdomain_stub.c | 1 - drivers/scsi/pcmcia/nsp_cs.c | 15 ++++++--------- drivers/scsi/pcmcia/qlogic_stub.c | 1 - drivers/scsi/pcmcia/sym53c500_cs.c | 1 - drivers/serial/serial_cs.c | 12 +----------- drivers/telephony/ixj_pcmcia.c | 3 --- drivers/usb/host/sl811_cs.c | 15 ++++++--------- include/pcmcia/cs.h | 2 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 4 ---- sound/pcmcia/vx/vxpocket.c | 1 - 46 files changed, 64 insertions(+), 207 deletions(-)
70294b468302fd7a0a99dad935c7ba5322989345
drivers/bluetooth/bluecard_cs.c +0 -4
@@ -878,7 +878,6 @@ static int bluecard_attach(struct pcmcia link->irq.Instance = info; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -925,7 +924,6 @@ static void bluecard_config(dev_link_t *tuple_t tuple;u_short buf[256 ];cisparse_t parse; -config_info_t config;int i, n, last_ret, last_fn; tuple.TupleData = (cisdata_t *)buf;
@@ -945,8 +943,6 @@ static void bluecard_config(dev_link_t */* Configure card */ link->state |=DEV_CONFIG ; - i =pcmcia_get_configuration_info (handle, &config); - link->conf.Vcc = config.Vcc; link->conf.ConfigIndex =0x20 ; link->io.NumPorts1 =64 ;
drivers/bluetooth/bt3c_cs.c +1 -5
@@ -670,7 +670,6 @@ static int bt3c_attach(struct pcmcia_dev link->irq.Instance = info; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -728,7 +727,6 @@ static void bt3c_config(dev_link_t *linku_short buf[256 ];cisparse_t parse;cistpl_cftable_entry_t *cf = &parse.cftable_entry; -config_info_t config;int i, j, try, last_ret, last_fn; tuple.TupleData = (cisdata_t *)buf;
@@ -748,8 +746,6 @@ static void bt3c_config(dev_link_t *link/* Configure card */ link->state |=DEV_CONFIG ; - i =pcmcia_get_configuration_info (handle, &config); - link->conf.Vcc = config.Vcc;/* First pass: look for a config entry that looks normal. */ tuple.TupleData = (cisdata_t *)buf;
@@ -764,7 +760,7 @@ static void bt3c_config(dev_link_t *linkif (i !=CS_SUCCESS ) goto next_entry;if (cf->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = cf->vpp1.param[CISTPL_POWER_VNOM ] /10000 ; + link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM ] /10000 ;if ((cf->io.nwin >0 ) && (cf->io.win[0 ].len ==8 ) && (cf->io.win[0 ].base !=0 )) { link->conf.ConfigIndex = cf->index; link->io.BasePort1 = cf->io.win[0 ].base;
drivers/bluetooth/btuart_cs.c +1 -5
@@ -598,7 +598,6 @@ static int btuart_attach(struct pcmcia_d link->irq.Instance = info; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -656,7 +655,6 @@ static void btuart_config(dev_link_t *liu_short buf[256 ];cisparse_t parse;cistpl_cftable_entry_t *cf = &parse.cftable_entry; -config_info_t config;int i, j, try, last_ret, last_fn; tuple.TupleData = (cisdata_t *)buf;
@@ -676,8 +674,6 @@ static void btuart_config(dev_link_t *li/* Configure card */ link->state |=DEV_CONFIG ; - i =pcmcia_get_configuration_info (handle, &config); - link->conf.Vcc = config.Vcc;/* First pass: look for a config entry that looks normal. */ tuple.TupleData = (cisdata_t *) buf;
@@ -692,7 +688,7 @@ static void btuart_config(dev_link_t *liif (i !=CS_SUCCESS ) goto next_entry;if (cf->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = cf->vpp1.param[CISTPL_POWER_VNOM ] /10000 ; + link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM ] /10000 ;if ((cf->io.nwin >0 ) && (cf->io.win[0 ].len ==8 ) && (cf->io.win[0 ].base !=0 )) { link->conf.ConfigIndex = cf->index; link->io.BasePort1 = cf->io.win[0 ].base;
drivers/bluetooth/dtl1_cs.c +0 -4
@@ -577,7 +577,6 @@ static int dtl1_attach(struct pcmcia_dev link->irq.Instance = info; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -634,7 +633,6 @@ static void dtl1_config(dev_link_t *linku_short buf[256 ];cisparse_t parse;cistpl_cftable_entry_t *cf = &parse.cftable_entry; -config_info_t config;int i, last_ret, last_fn; tuple.TupleData = (cisdata_t *)buf;
@@ -654,8 +652,6 @@ static void dtl1_config(dev_link_t *link/* Configure card */ link->state |=DEV_CONFIG ; - i =pcmcia_get_configuration_info (handle, &config); - link->conf.Vcc = config.Vcc; tuple.TupleData = (cisdata_t *)buf; tuple.TupleOffset =0 ;
drivers/char/pcmcia/cm4000_cs.c +0 -7
@@ -1765,7 +1765,6 @@ static void cm4000_config(dev_link_t * lstruct cm4000_dev *dev;tuple_t tuple;cisparse_t parse; -config_info_t conf;u_char buf[64 ];int fail_fn, fail_rc;int rc;
@@ -1790,16 +1789,10 @@ static void cm4000_config(dev_link_t * l fail_fn = ParseTuple; goto cs_failed; } -if ((fail_rc = -pcmcia_get_configuration_info (handle, &conf)) !=CS_SUCCESS ) { - fail_fn = GetConfigurationInfo; - goto cs_failed; - } link->state |=DEV_CONFIG ; link->conf.ConfigBase = parse.config.base; link->conf.Present = parse.config.rmask[0 ]; - link->conf.Vcc = conf.Vcc; link->io.BasePort2 =0 ; link->io.NumPorts2 =0 ;
drivers/char/pcmcia/cm4040_cs.c +0 -7
@@ -520,7 +520,6 @@ static void reader_config(dev_link_t *listruct reader_dev *dev;tuple_t tuple;cisparse_t parse; -config_info_t conf;u_char buf[64 ];int fail_fn, fail_rc;int rc;
@@ -546,16 +545,10 @@ static void reader_config(dev_link_t *li fail_fn = ParseTuple; goto cs_failed; } -if ((fail_rc =pcmcia_get_configuration_info (handle, &conf)) - !=CS_SUCCESS ) { - fail_fn = GetConfigurationInfo; - goto cs_failed; - } link->state |=DEV_CONFIG ; link->conf.ConfigBase = parse.config.base; link->conf.Present = parse.config.rmask[0 ]; - link->conf.Vcc = conf.Vcc; link->io.BasePort2 =0 ; link->io.NumPorts2 =0 ;
drivers/char/pcmcia/synclink_cs.c +0 -7
@@ -576,7 +576,6 @@ static int mgslpc_attach(struct pcmcia_d link->irq.Handler =NULL ; link->conf.Attributes =0 ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -604,7 +603,6 @@ static void mgslpc_config(dev_link_t *licisparse_t parse;int last_fn, last_ret;u_char buf[64 ]; -config_info_t conf;cistpl_cftable_entry_t dflt = {0 };cistpl_cftable_entry_t *cfg;
@@ -626,10 +624,6 @@ static void mgslpc_config(dev_link_t *li/* Configure card */ link->state |=DEV_CONFIG ; -/* Look up the current Vcc */ -CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); - link->conf.Vcc = conf.Vcc; -/* get CIS configuration entry */ tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ;
@@ -662,7 +656,6 @@ static void mgslpc_config(dev_link_t *li } link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =8 ; link->conf.Present =PRESENT_OPTION ;
drivers/ide/legacy/ide-cs.c +4 -7
@@ -122,7 +122,6 @@ static int ide_attach(struct pcmcia_devi link->irq.Attributes =IRQ_TYPE_EXCLUSIVE ; link->irq.IRQInfo1 =IRQ_LEVEL_ID ; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -222,7 +221,6 @@ static void ide_config(dev_link_t *link)/* Not sure if this is right... look up the current Vcc */ CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &stk->conf)); - link->conf.Vcc = stk->conf.Vcc; pass = io_base = ctl_base =0 ; tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ;
@@ -244,10 +242,10 @@ static void ide_config(dev_link_t *link) }if (cfg->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM ] /10000 ;else if (stk->dflt.vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = stk->dflt.vpp1.param[CISTPL_POWER_VNOM ] /10000 ;if ((cfg->io.nwin >0 ) || (stk->dflt.io.nwin >0 )) {
@@ -329,9 +327,8 @@ static void ide_config(dev_link_t *link) info->node.minor =0 ; info->hd = hd; link->dev = &info->node; -printk (KERN_INFO "ide-cs: %s: Vcc = %d.%d, Vpp = %d.%d\n" , - info->node.dev_name, link->conf.Vcc /10 , link->conf.Vcc %10 , - link->conf.Vpp1 /10 , link->conf.Vpp1 %10 ); +printk (KERN_INFO "ide-cs: %s: Vpp = %d.%d\n" , + info->node.dev_name, link->conf.Vpp /10 , link->conf.Vpp %10 ); link->state &= ~DEV_CONFIG_PENDING ;kfree (stk);
drivers/isdn/hardware/avm/avm_cs.c +0 -1
@@ -123,7 +123,6 @@ static int avmcs_attach(struct pcmcia_de/* General socket configuration */ link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
drivers/isdn/hisax/avma1_cs.c +0 -1
@@ -153,7 +153,6 @@ static int avma1cs_attach(struct pcmcia_/* General socket configuration */ link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
drivers/isdn/hisax/elsa_cs.c +2 -6
@@ -170,7 +170,6 @@ static int elsa_cs_attach(struct pcmcia_ link->io.IOAddrLines =3 ; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -324,11 +323,8 @@ static void elsa_cs_config(dev_link_t *l link->dev = &dev->node;/* Finally, report what we've done */ -printk (KERN_INFO "%s: index 0x%02x: Vcc %d.%d" , - dev->node.dev_name, link->conf.ConfigIndex, - link->conf.Vcc/10 , link->conf.Vcc%10 ); -if (link->conf.Vpp1) -printk (", Vpp %d.%d" , link->conf.Vpp1/10 , link->conf.Vpp1%10 ); +printk (KERN_INFO "%s: index 0x%02x: " , + dev->node.dev_name, link->conf.ConfigIndex);if (link->conf.Attributes &CONF_ENABLE_IRQ )printk (", irq %d" , link->irq.AssignedIRQ);if (link->io.NumPorts1)
drivers/isdn/hisax/sedlbauer_cs.c +6 -10
@@ -184,7 +184,6 @@ static int sedlbauer_attach(struct pcmci link->conf.Attributes =0 ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -263,9 +262,7 @@ static void sedlbauer_config(dev_link_t/* Configure card */ link->state |=DEV_CONFIG ; -/* Look up the current Vcc */ CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); - link->conf.Vcc = conf.Vcc;/* In this loop, we scan the CIS for configuration table entries,
@@ -309,10 +306,10 @@ static void sedlbauer_config(dev_link_t }if (cfg->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM ]/10000 ;else if (dflt.vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = dflt.vpp1.param[CISTPL_POWER_VNOM ]/10000 ;/* Do we need to allocate an interrupt? */
@@ -403,11 +400,10 @@ static void sedlbauer_config(dev_link_t link->dev = &dev->node;/* Finally, report what we've done */ -printk (KERN_INFO "%s: index 0x%02x: Vcc %d.%d" , - dev->node.dev_name, link->conf.ConfigIndex, - link->conf.Vcc/10 , link->conf.Vcc%10 ); -if (link->conf.Vpp1) -printk (", Vpp %d.%d" , link->conf.Vpp1/10 , link->conf.Vpp1%10 ); +printk (KERN_INFO "%s: index 0x%02x:" , + dev->node.dev_name, link->conf.ConfigIndex); +if (link->conf.Vpp) +printk (", Vpp %d.%d" , link->conf.Vpp/10 , link->conf.Vpp%10 );if (link->conf.Attributes &CONF_ENABLE_IRQ )printk (", irq %d" , link->irq.AssignedIRQ);if (link->io.NumPorts1)
drivers/isdn/hisax/teles_cs.c +2 -6
@@ -161,7 +161,6 @@ static int teles_attach(struct pcmcia_de link->io.IOAddrLines =5 ; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -315,11 +314,8 @@ static void teles_cs_config(dev_link_t * link->dev = &dev->node;/* Finally, report what we've done */ -printk (KERN_INFO "%s: index 0x%02x: Vcc %d.%d" , - dev->node.dev_name, link->conf.ConfigIndex, - link->conf.Vcc/10 , link->conf.Vcc%10 ); -if (link->conf.Vpp1) -printk (", Vpp %d.%d" , link->conf.Vpp1/10 , link->conf.Vpp1%10 ); +printk (KERN_INFO "%s: index 0x%02x:" , + dev->node.dev_name, link->conf.ConfigIndex);if (link->conf.Attributes &CONF_ENABLE_IRQ )printk (", irq %d" , link->irq.AssignedIRQ);if (link->io.NumPorts1)
drivers/mtd/maps/pcmciamtd.c +2 -5
@@ -587,13 +587,10 @@ static void pcmciamtd_config(dev_link_tDEBUG (2 ,"Vcc = %d Vpp1 = %d Vpp2 = %d" , t.Vcc, t.Vpp1, t.Vpp2); dev->vpp = (vpp) ? vpp : t.Vpp1; link->conf.Attributes =0 ; - link->conf.Vcc = t.Vcc;if (setvpp ==2 ) { - link->conf.Vpp1 = dev->vpp; - link->conf.Vpp2 = dev->vpp; + link->conf.Vpp = dev->vpp; }else { - link->conf.Vpp1 =0 ; - link->conf.Vpp2 =0 ; + link->conf.Vpp =0 ; } link->conf.IntType =INT_MEMORY ;
drivers/net/pcmcia/3c574_cs.c +0 -1
@@ -280,7 +280,6 @@ static int tc574_attach(struct pcmcia_de link->irq.Handler = &el3_interrupt; link->irq.Instance = dev; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
drivers/net/pcmcia/3c589_cs.c +0 -1
@@ -194,7 +194,6 @@ static int tc589_attach(struct pcmcia_de link->irq.Handler = &el3_interrupt; link->irq.Instance = dev; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
drivers/net/pcmcia/axnet_cs.c +0 -5
@@ -302,7 +302,6 @@ static void axnet_config(dev_link_t *lincisparse_t parse;int i, j, last_ret, last_fn;u_short buf[64 ]; -config_info_t conf;DEBUG (0 ,"axnet_config(0x%p)\n" , link);
@@ -321,10 +320,6 @@ static void axnet_config(dev_link_t *lin/* Configure card */ link->state |=DEV_CONFIG ; -/* Look up current Vcc */ -CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); - link->conf.Vcc = conf.Vcc; - tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ; tuple.Attributes =0 ;CS_CHECK (GetFirstTuple,pcmcia_get_first_tuple (handle, &tuple));
drivers/net/pcmcia/com20020_cs.c +0 -1
@@ -178,7 +178,6 @@ static int com20020_attach(struct pcmcia link->irq.Attributes =IRQ_TYPE_EXCLUSIVE ; link->irq.IRQInfo1 =IRQ_LEVEL_ID ; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.Present =PRESENT_OPTION ;
drivers/net/pcmcia/fmvj18x_cs.c +1 -7
@@ -257,7 +257,6 @@ static int fmvj18x_attach(struct pcmcia_/* General socket configuration */ link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ;/* The FMVJ18x specific entries in the device structure. */
@@ -396,12 +395,7 @@ static void fmvj18x_config(dev_link_t *lswitch (le16_to_cpu (buf[0 ])) {case MANFID_TDK : cardtype =TDK ; -if (le16_to_cpu (buf[1 ]) ==PRODID_TDK_CF010 ) { -cs_status_t status; -pcmcia_get_status (handle, &status); -if (status.CardState &CS_EVENT_3VCARD ) - link->conf.Vcc =33 ;/* inserted in 3.3V slot */ - }else if (le16_to_cpu (buf[1 ]) ==PRODID_TDK_GN3410 +if (le16_to_cpu (buf[1 ]) ==PRODID_TDK_GN3410 ||le16_to_cpu (buf[1 ]) ==PRODID_TDK_NP9610 ||le16_to_cpu (buf[1 ]) ==PRODID_TDK_MN3200 ) {/* MultiFunction Card */
drivers/net/pcmcia/ibmtr_cs.c +0 -1
@@ -167,7 +167,6 @@ static int ibmtr_attach(struct pcmcia_de link->irq.IRQInfo1 =IRQ_LEVEL_ID ; link->irq.Handler = &tok_interrupt; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.Present =PRESENT_OPTION ;
drivers/net/pcmcia/nmclan_cs.c +0 -1
@@ -469,7 +469,6 @@ static int nmclan_attach(struct pcmcia_d link->irq.Handler = &mace_interrupt; link->irq.Instance = dev; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
drivers/net/pcmcia/pcnet_cs.c +0 -5
@@ -531,7 +531,6 @@ static void pcnet_config(dev_link_t *linint i, last_ret, last_fn, start_pg, stop_pg, cm_offset;int manfid =0 , prodid =0 , has_shmem =0 ;u_short buf[64 ]; -config_info_t conf;hw_info_t *hw_info;DEBUG (0 ,"pcnet_config(0x%p)\n" , link);
@@ -550,10 +549,6 @@ static void pcnet_config(dev_link_t *lin/* Configure card */ link->state |=DEV_CONFIG ; -/* Look up current Vcc */ -CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); - link->conf.Vcc = conf.Vcc; - tuple.DesiredTuple =CISTPL_MANFID ; tuple.Attributes =TUPLE_RETURN_COMMON ; if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) &&
drivers/net/pcmcia/smc91c92_cs.c +0 -1
@@ -334,7 +334,6 @@ static int smc91c92_attach(struct pcmcia link->irq.Handler = &smc_interrupt; link->irq.Instance = dev; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ;/* The SMC91c92-specific entries in the device structure. */
drivers/net/pcmcia/xirc2ps_cs.c +0 -1
@@ -571,7 +571,6 @@ xirc2ps_attach(struct pcmcia_device *p_d/* General socket configuration */ link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
drivers/net/wireless/airo_cs.c +6 -13
@@ -168,7 +168,6 @@ static int airo_attach(struct pcmcia_devdevice, and can be hard-wired here. */ link->conf.Attributes =0 ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ;/* Allocate space for private device-specific data */
@@ -294,16 +293,11 @@ static void airo_config(dev_link_t *link/* Use power settings for Vcc and Vpp if present */ /* Note that the CIS values need to be rescaled */ -if (cfg->vcc.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vcc = cfg->vcc.param[CISTPL_POWER_VNOM ]/10000 ; -else if (dflt.vcc.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vcc = dflt.vcc.param[CISTPL_POWER_VNOM ]/10000 ; -if (cfg->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM ]/10000 ;else if (dflt.vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = dflt.vpp1.param[CISTPL_POWER_VNOM ]/10000 ;/* Do we need to allocate an interrupt? */
@@ -391,11 +385,10 @@ static void airo_config(dev_link_t *link link->dev = &dev->node;/* Finally, report what we've done */ -printk (KERN_INFO "%s: index 0x%02x: Vcc %d.%d" , - dev->node.dev_name, link->conf.ConfigIndex, - link->conf.Vcc/10 , link->conf.Vcc%10 ); -if (link->conf.Vpp1) -printk (", Vpp %d.%d" , link->conf.Vpp1/10 , link->conf.Vpp1%10 ); +printk (KERN_INFO "%s: index 0x%02x: " , + dev->node.dev_name, link->conf.ConfigIndex); +if (link->conf.Vpp) +printk (", Vpp %d.%d" , link->conf.Vpp/10 , link->conf.Vpp%10 );if (link->conf.Attributes &CONF_ENABLE_IRQ )printk (", irq %d" , link->irq.AssignedIRQ);if (link->io.NumPorts1)
drivers/net/wireless/atmel_cs.c +2 -8
@@ -179,7 +179,6 @@ static int atmel_attach(struct pcmcia_dedevice, and can be hard-wired here. */ link->conf.Attributes =0 ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ;/* Allocate space for private device-specific data */
@@ -314,16 +313,11 @@ static void atmel_config(dev_link_t *lin/* Use power settings for Vcc and Vpp if present */ /* Note that the CIS values need to be rescaled */ -if (cfg->vcc.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vcc = cfg->vcc.param[CISTPL_POWER_VNOM ]/10000 ; -else if (dflt.vcc.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vcc = dflt.vcc.param[CISTPL_POWER_VNOM ]/10000 ; -if (cfg->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM ]/10000 ;else if (dflt.vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = dflt.vpp1.param[CISTPL_POWER_VNOM ]/10000 ;/* Do we need to allocate an interrupt? */
drivers/net/wireless/hostap/hostap_cs.c +7 -12
@@ -512,7 +512,6 @@ static int prism2_attach(struct pcmcia_dmemset (link,0 ,sizeof (dev_link_t));PDEBUG (DEBUG_HW ,"%s: setting Vcc=33 (constant)\n" , dev_info); - link->conf.Vcc =33 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -603,9 +602,6 @@ static int prism2_config(dev_link_t *linCS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (link->handle, &conf)); -PDEBUG (DEBUG_HW ,"%s: %s Vcc=%d (from config)\n" , dev_info, - ignore_cis_vcc ?"ignoring" :"setting" , conf.Vcc); - link->conf.Vcc = conf.Vcc;/* Look for an appropriate configuration table entry in the CIS */ tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ;
@@ -650,10 +646,10 @@ static int prism2_config(dev_link_t *lin }if (cfg->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM ] /10000 ;else if (dflt.vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = dflt.vpp1.param[CISTPL_POWER_VNOM ] /10000 ;/* Do we need to allocate an interrupt? */
@@ -745,12 +741,11 @@ static int prism2_config(dev_link_t *lin dev->base_addr = link->io.BasePort1;/* Finally, report what we've done */ -printk (KERN_INFO "%s: index 0x%02x: Vcc %d.%d" , - dev_info, link->conf.ConfigIndex, - link->conf.Vcc /10 , link->conf.Vcc %10 ); -if (link->conf.Vpp1) -printk (", Vpp %d.%d" , link->conf.Vpp1 /10 , - link->conf.Vpp1 %10 ); +printk (KERN_INFO "%s: index 0x%02x: " , + dev_info, link->conf.ConfigIndex); +if (link->conf.Vpp) +printk (", Vpp %d.%d" , link->conf.Vpp /10 , + link->conf.Vpp %10 );if (link->conf.Attributes &CONF_ENABLE_IRQ )printk (", irq %d" , link->irq.AssignedIRQ);if (link->io.NumPorts1)
drivers/net/wireless/netwave_cs.c +0 -1
@@ -406,7 +406,6 @@ static int netwave_attach(struct pcmcia_/* General socket configuration */ link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
drivers/net/wireless/orinoco_cs.c +8 -10
@@ -218,8 +218,7 @@ orinoco_cs_config(dev_link_t *link)/* Look up the current Vcc */ CS_CHECK (GetConfigurationInfo, -pcmcia_get_configuration_info (handle, &conf)); - link->conf.Vcc = conf.Vcc; +pcmcia_get_configuration_info (link->handle, &conf));/* * In this loop, we scan the CIS for configuration table
@@ -274,10 +273,10 @@ orinoco_cs_config(dev_link_t *link) }if (cfg->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM ] /10000 ;else if (dflt.vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = dflt.vpp1.param[CISTPL_POWER_VNOM ] /10000 ;/* Do we need to allocate an interrupt? */
@@ -373,12 +372,11 @@ orinoco_cs_config(dev_link_t *link) link->state &= ~DEV_CONFIG_PENDING ;/* Finally, report what we've done */ -printk (KERN_DEBUG "%s: index 0x%02x: Vcc %d.%d" , - dev->name, link->conf.ConfigIndex, - link->conf.Vcc /10 , link->conf.Vcc %10 ); -if (link->conf.Vpp1) -printk (", Vpp %d.%d" , link->conf.Vpp1 /10 , - link->conf.Vpp1 %10 ); +printk (KERN_DEBUG "%s: index 0x%02x: " , + dev->name, link->conf.ConfigIndex); +if (link->conf.Vpp) +printk (", Vpp %d.%d" , link->conf.Vpp /10 , + link->conf.Vpp %10 );printk (", irq %d" , link->irq.AssignedIRQ);if (link->io.NumPorts1) printk(", io 0x%04x-0x%04x", link->io.BasePort1,
drivers/net/wireless/ray_cs.c +0 -1
@@ -342,7 +342,6 @@ static int ray_attach(struct pcmcia_devi/* General socket configuration */ link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
drivers/net/wireless/spectrum_cs.c +7 -9
@@ -692,7 +692,6 @@ spectrum_cs_config(dev_link_t *link)/* Look up the current Vcc */ CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); - link->conf.Vcc = conf.Vcc;/* * In this loop, we scan the CIS for configuration table
@@ -747,10 +746,10 @@ spectrum_cs_config(dev_link_t *link) }if (cfg->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM ] /10000 ;else if (dflt.vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = dflt.vpp1.param[CISTPL_POWER_VNOM ] /10000 ;/* Do we need to allocate an interrupt? */
@@ -851,12 +850,11 @@ spectrum_cs_config(dev_link_t *link) link->state &= ~DEV_CONFIG_PENDING ;/* Finally, report what we've done */ -printk (KERN_DEBUG "%s: index 0x%02x: Vcc %d.%d" , - dev->name, link->conf.ConfigIndex, - link->conf.Vcc /10 , link->conf.Vcc %10 ); -if (link->conf.Vpp1) -printk (", Vpp %d.%d" , link->conf.Vpp1 /10 , - link->conf.Vpp1 %10 ); +printk (KERN_DEBUG "%s: index 0x%02x: " , + dev->name, link->conf.ConfigIndex); +if (link->conf.Vpp) +printk (", Vpp %d.%d" , link->conf.Vpp /10 , + link->conf.Vpp %10 );printk (", irq %d" , link->irq.AssignedIRQ);if (link->io.NumPorts1) printk(", io 0x%04x-0x%04x", link->io.BasePort1,
drivers/net/wireless/wavelan_cs.c +0 -1
@@ -4607,7 +4607,6 @@ wavelan_attach(struct pcmcia_device *p_d/* General socket configuration */ link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ;/* Chain drivers */
drivers/net/wireless/wl3501_cs.c +0 -1
@@ -1976,7 +1976,6 @@ static int wl3501_attach(struct pcmcia_d/* General socket configuration */ link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
drivers/parport/parport_cs.c +0 -5
@@ -117,7 +117,6 @@ static int parport_attach(struct pcmcia_ link->irq.Attributes =IRQ_TYPE_EXCLUSIVE ; link->irq.IRQInfo1 =IRQ_LEVEL_ID ; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
@@ -168,7 +167,6 @@ void parport_config(dev_link_t *link)tuple_t tuple;u_short buf[128 ];cisparse_t parse; -config_info_t conf;cistpl_cftable_entry_t *cfg = &parse.cftable_entry;cistpl_cftable_entry_t dflt = {0 };struct parport *p;
@@ -189,9 +187,6 @@ void parport_config(dev_link_t *link)/* Configure card */ link->state |=DEV_CONFIG ; -/* Not sure if this is right... look up the current Vcc */ -CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); - tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ; tuple.Attributes =0 ;CS_CHECK (GetFirstTuple,pcmcia_get_first_tuple (handle, &tuple));
drivers/pcmcia/pcmcia_resource.c +1 -5
@@ -618,11 +618,7 @@ int pcmcia_request_configuration(structreturn CS_CONFIGURATION_LOCKED ;/* Do power control. We don't allow changes in Vcc. */ -if (s->socket.Vcc != req->Vcc) -return CS_BAD_VCC ; -if (req->Vpp1 != req->Vpp2) -return CS_BAD_VPP ; - s->socket.Vpp = req->Vpp1; + s->socket.Vpp = req->Vpp;if (s->ops->set_socket (s, &s->socket))return CS_BAD_VPP ;
drivers/scsi/pcmcia/aha152x_stub.c +0 -1
@@ -119,7 +119,6 @@ static int aha152x_attach(struct pcmcia_ link->irq.Attributes =IRQ_TYPE_EXCLUSIVE ; link->irq.IRQInfo1 =IRQ_LEVEL_ID ; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.Present =PRESENT_OPTION ;
drivers/scsi/pcmcia/fdomain_stub.c +0 -1
@@ -101,7 +101,6 @@ static int fdomain_attach(struct pcmcia_ link->irq.Attributes =IRQ_TYPE_EXCLUSIVE ; link->irq.IRQInfo1 =IRQ_LEVEL_ID ; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.Present =PRESENT_OPTION ;
drivers/scsi/pcmcia/nsp_cs.c +6 -9
@@ -1627,7 +1627,6 @@ static int nsp_cs_attach(struct pcmcia_d/* General socket configuration */ link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.Present =PRESENT_OPTION ;
@@ -1709,7 +1708,6 @@ static void nsp_cs_config(dev_link_t *li/* Look up the current Vcc */ CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); - link->conf.Vcc = conf.Vcc; tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ;CS_CHECK (GetFirstTuple,pcmcia_get_first_tuple (handle, &tuple));
@@ -1743,10 +1741,10 @@ static void nsp_cs_config(dev_link_t *li }if (cfg->vpp1.present & (1 <<CISTPL_POWER_VNOM )) { - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM ] /10000 ; }else if (dflt.vpp1.present & (1 <<CISTPL_POWER_VNOM )) { - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = dflt.vpp1.param[CISTPL_POWER_VNOM ] /10000 ; }
@@ -1905,11 +1903,10 @@ static void nsp_cs_config(dev_link_t *li#endif /* Finally, report what we've done */ -printk (KERN_INFO "nsp_cs: index 0x%02x: Vcc %d.%d" , - link->conf.ConfigIndex, - link->conf.Vcc/10 , link->conf.Vcc%10 ); -if (link->conf.Vpp1) { -printk (", Vpp %d.%d" , link->conf.Vpp1/10 , link->conf.Vpp1%10 ); +printk (KERN_INFO "nsp_cs: index 0x%02x: " , + link->conf.ConfigIndex); +if (link->conf.Vpp) { +printk (", Vpp %d.%d" , link->conf.Vpp/10 , link->conf.Vpp%10 ); }if (link->conf.Attributes &CONF_ENABLE_IRQ ) {printk (", irq %d" , link->irq.AssignedIRQ);
drivers/scsi/pcmcia/qlogic_stub.c +0 -1
@@ -176,7 +176,6 @@ static int qlogic_attach(struct pcmcia_d link->irq.Attributes =IRQ_TYPE_EXCLUSIVE ; link->irq.IRQInfo1 =IRQ_LEVEL_ID ; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.Present =PRESENT_OPTION ;
drivers/scsi/pcmcia/sym53c500_cs.c +0 -1
@@ -916,7 +916,6 @@ SYM53C500_attach(struct pcmcia_device *p link->irq.Attributes =IRQ_TYPE_EXCLUSIVE ; link->irq.IRQInfo1 =IRQ_LEVEL_ID ; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.Present =PRESENT_OPTION ;
drivers/serial/serial_cs.c +1 -11
@@ -358,7 +358,6 @@ static int simple_config(dev_link_t *linreturn setup_serial (handle, info, port, config.AssignedIRQ); } } - link->conf.Vcc = config.Vcc;/* First pass: look for a config entry that looks normal. */ tuple->TupleData = (cisdata_t *) buf;
@@ -374,7 +373,7 @@ static int simple_config(dev_link_t *linif (i !=CS_SUCCESS ) goto next_entry;if (cf->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM ] /10000 ;if ((cf->io.nwin >0 ) && (cf->io.win[0 ].len == size_table[s]) && (cf->io.win[0 ].base !=0 )) {
@@ -445,7 +444,6 @@ static int multi_config(dev_link_t * linu_char *buf;cisparse_t *parse;cistpl_cftable_entry_t *cf; -config_info_t config;int i, rc, base2 =0 ; cfg_mem =kmalloc (sizeof (struct serial_cfg_mem ),GFP_KERNEL );
@@ -456,14 +454,6 @@ static int multi_config(dev_link_t * lin cf = &parse->cftable_entry; buf = cfg_mem->buf; - i =pcmcia_get_configuration_info (handle, &config); -if (i !=CS_SUCCESS ) { -cs_error (handle, GetConfigurationInfo, i); - rc =-1 ; - goto free_cfg_mem; - } - link->conf.Vcc = config.Vcc; - tuple->TupleData = (cisdata_t *) buf; tuple->TupleOffset =0 ; tuple->TupleDataMax =255 ;
drivers/telephony/ixj_pcmcia.c +0 -3
@@ -51,7 +51,6 @@ static int ixj_attach(struct pcmcia_devi link->io.Attributes1 =IO_DATA_PATH_WIDTH_8 ; link->io.Attributes2 =IO_DATA_PATH_WIDTH_8 ; link->io.IOAddrLines =3 ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->priv =kmalloc (sizeof (struct ixj_info_t ),GFP_KERNEL );if (!link->priv) {
@@ -157,7 +156,6 @@ static void ixj_config(dev_link_t * linktuple_t tuple;u_short buf[128 ];cisparse_t parse; -config_info_t conf;cistpl_cftable_entry_t *cfg = &parse.cftable_entry;cistpl_cftable_entry_t dflt = {
@@ -178,7 +176,6 @@ static void ixj_config(dev_link_t * link link->conf.ConfigBase = parse.config.base; link->conf.Present = parse.config.rmask[0 ]; link->state |=DEV_CONFIG ; -CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ; tuple.Attributes =0 ;CS_CHECK (GetFirstTuple,pcmcia_get_first_tuple (handle, &tuple));
drivers/usb/host/sl811_cs.c +6 -9
@@ -191,7 +191,6 @@ static void sl811_cs_config(dev_link_t */* Look up the current Vcc */ CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); - link->conf.Vcc = conf.Vcc; tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ;CS_CHECK (GetFirstTuple,pcmcia_get_first_tuple (handle, &tuple));
@@ -225,10 +224,10 @@ static void sl811_cs_config(dev_link_t * }if (cfg->vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM ]/10000 ;else if (dflt.vpp1.present & (1 <<CISTPL_POWER_VNOM )) - link->conf.Vpp1 = link->conf.Vpp2 = + link->conf.Vpp = dflt.vpp1.param[CISTPL_POWER_VNOM ]/10000 ;/* we need an interrupt */
@@ -271,11 +270,10 @@ next_entry: dev->node.major = dev->node.minor =0 ; link->dev = &dev->node; -printk (KERN_INFO "%s: index 0x%02x: Vcc %d.%d" , - dev->node.dev_name, link->conf.ConfigIndex, - link->conf.Vcc/10 , link->conf.Vcc%10 ); -if (link->conf.Vpp1) -printk (", Vpp %d.%d" , link->conf.Vpp1/10 , link->conf.Vpp1%10 ); +printk (KERN_INFO "%s: index 0x%02x: " , + dev->node.dev_name, link->conf.ConfigIndex); +if (link->conf.Vpp) +printk (", Vpp %d.%d" , link->conf.Vpp/10 , link->conf.Vpp%10 );printk (", irq %d" , link->irq.AssignedIRQ);printk (", io 0x%04x-0x%04x" , link->io.BasePort1, link->io.BasePort1+link->io.NumPorts1-1 );
@@ -311,7 +309,6 @@ static int sl811_cs_attach(struct pcmcia link->irq.Handler =NULL ; link->conf.Attributes =0 ; - link->conf.Vcc =33 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->handle = p_dev;
include/pcmcia/cs.h +1 -1
@@ -125,7 +125,7 @@ typedef struct modconf_t {/* For RequestConfiguration */ typedef struct config_req_t { u_int Attributes; - u_int Vcc, Vpp1, Vpp2; + u_int Vpp; /* both Vpp1 and Vpp2 */ u_int IntType; u_int ConfigBase; u_char Status, Pin, Copy, ExtStatus;
sound/pcmcia/pdaudiocf/pdaudiocf.c +0 -4
@@ -230,7 +230,6 @@ static void pdacf_config(dev_link_t *linstruct snd_pdacf *pdacf = link->priv;tuple_t tuple;cisparse_t *parse =NULL ; -config_info_t conf;u_short buf[32 ];int last_fn, last_ret;
@@ -253,9 +252,6 @@ static void pdacf_config(dev_link_t *lin link->conf.ConfigIndex =0x5 ;kfree (parse); -CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); - link->conf.Vcc = conf.Vcc; -/* Configure card */ link->state |=DEV_CONFIG ;
sound/pcmcia/vx/vxpocket.c +0 -1
@@ -161,7 +161,6 @@ static struct snd_vxpocket *snd_vxpocket link->irq.Instance = chip; link->conf.Attributes =CONF_ENABLE_IRQ ; - link->conf.Vcc =50 ; link->conf.IntType =INT_MEMORY_AND_IO ; link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ;
Signature · 1 line
1.2.4
Dominik Brodowski
maintainerPATCH 25/33 pcmcia: add return value to _config() functions
In reply to Dominik BrodowskiMost of the driver initialization isn't done in the .probe function, but in the internal _config() functions. Make them return a value, so that .probe can properly report whether the probing of the device succeeded or not.
---
drivers/bluetooth/bluecard_cs.c | 15 +++---- drivers/bluetooth/bt3c_cs.c | 15 +++---- drivers/bluetooth/btuart_cs.c | 15 +++---- drivers/bluetooth/dtl1_cs.c | 15 +++---- drivers/char/pcmcia/cm4000_cs.c | 15 ++++--- drivers/char/pcmcia/cm4040_cs.c | 15 ++++--- drivers/char/pcmcia/synclink_cs.c | 16 +++++-- drivers/ide/legacy/ide-cs.c | 15 +++---- drivers/isdn/hardware/avm/avm_cs.c | 21 +++++----- drivers/isdn/hisax/avma1_cs.c | 19 ++++----- drivers/isdn/hisax/elsa_cs.c | 15 +++---- drivers/isdn/hisax/sedlbauer_cs.c | 16 ++++--- drivers/isdn/hisax/teles_cs.c | 21 +++++----- drivers/mtd/maps/pcmciamtd.c | 23 +++++------ drivers/net/pcmcia/3c574_cs.c | 16 +++---- drivers/net/pcmcia/3c589_cs.c | 17 +++----- drivers/net/pcmcia/axnet_cs.c | 16 +++---- drivers/net/pcmcia/com20020_cs.c | 15 +++---- drivers/net/pcmcia/fmvj18x_cs.c | 16 +++---- drivers/net/pcmcia/ibmtr_cs.c | 11 ++--- drivers/net/pcmcia/nmclan_cs.c | 23 +++++------ drivers/net/pcmcia/pcnet_cs.c | 12 ++---- drivers/net/pcmcia/smc91c92_cs.c | 16 +++---- drivers/net/pcmcia/xirc2ps_cs.c | 17 ++++---- drivers/net/wireless/airo_cs.c | 18 ++++---- drivers/net/wireless/atmel_cs.c | 15 +++---- drivers/net/wireless/hostap/hostap_cs.c | 12 ++++-- drivers/net/wireless/netwave_cs.c | 15 +++---- drivers/net/wireless/orinoco_cs.c | 15 +++---- drivers/net/wireless/ray_cs.c | 19 ++++----- drivers/net/wireless/spectrum_cs.c | 15 +++---- drivers/net/wireless/wavelan_cs.c | 20 ++++++--- drivers/net/wireless/wl3501_cs.c | 18 ++++---- drivers/parport/parport_cs.c | 18 ++++---- drivers/scsi/pcmcia/aha152x_stub.c | 19 ++++----- drivers/scsi/pcmcia/fdomain_stub.c | 67 +++++++++++++++---------------- drivers/scsi/pcmcia/nsp_cs.c | 21 ++++++---- drivers/scsi/pcmcia/nsp_cs.h | 2 - drivers/scsi/pcmcia/qlogic_stub.c | 19 ++++----- drivers/scsi/pcmcia/sym53c500_cs.c | 19 ++++----- drivers/serial/serial_cs.c | 11 ++--- drivers/telephony/ixj_pcmcia.c | 15 +++---- drivers/usb/host/sl811_cs.c | 12 +++--- sound/pcmcia/pdaudiocf/pdaudiocf.c | 17 ++++---- sound/pcmcia/vx/vxpocket.c | 15 +++---- 45 files changed, 376 insertions(+), 401 deletions(-)
15b99ac1729503db9e6dc642a50b9b6cb3bf51f9
drivers/bluetooth/bluecard_cs.c +7 -8
@@ -85,7 +85,7 @@ typedef struct bluecard_info_t { } bluecard_info_t; -static void bluecard_config (struct pcmcia_device *link); +static int bluecard_config (struct pcmcia_device *link);static void bluecard_release (struct pcmcia_device *link);static void bluecard_detach (struct pcmcia_device *p_dev);
@@ -856,7 +856,7 @@ static int bluecard_close(bluecard_info_return 0 ; } -static int bluecard_attach (struct pcmcia_device *link) +static int bluecard_probe (struct pcmcia_device *link) {bluecard_info_t *info;
@@ -880,9 +880,7 @@ static int bluecard_attach(struct pcmcia link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -bluecard_config (link); - -return 0 ; +return bluecard_config (link); }
@@ -912,7 +910,7 @@ static int first_tuple(struct pcmcia_devreturn pcmcia_parse_tuple (handle, tuple, parse); } -static void bluecard_config (struct pcmcia_device *link) +static int bluecard_config (struct pcmcia_device *link) {bluecard_info_t *info = link->priv;tuple_t tuple;
@@ -973,13 +971,14 @@ static void bluecard_config(struct pcmci link->dev_node = &info->node; link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:bluecard_release (link); +return -ENODEV ; }
@@ -1008,7 +1007,7 @@ static struct pcmcia_driver bluecard_dri .drv = { .name = "bluecard_cs", }, - .probe = bluecard_attach, + .probe = bluecard_probe, .remove = bluecard_detach, .id_table = bluecard_ids, };
drivers/bluetooth/bt3c_cs.c +7 -8
@@ -88,7 +88,7 @@ typedef struct bt3c_info_t { } bt3c_info_t; -static void bt3c_config (struct pcmcia_device *link); +static int bt3c_config (struct pcmcia_device *link);static void bt3c_release (struct pcmcia_device *link);static void bt3c_detach (struct pcmcia_device *p_dev);
@@ -645,7 +645,7 @@ static int bt3c_close(bt3c_info_t *info)return 0 ; } -static int bt3c_attach (struct pcmcia_device *link) +static int bt3c_probe (struct pcmcia_device *link) {bt3c_info_t *info;
@@ -669,9 +669,7 @@ static int bt3c_attach(struct pcmcia_dev link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -bt3c_config (link); - -return 0 ; +return bt3c_config (link); }
@@ -710,7 +708,7 @@ static int next_tuple(struct pcmcia_devireturn get_tuple (handle, tuple, parse); } -static void bt3c_config (struct pcmcia_device *link) +static int bt3c_config (struct pcmcia_device *link) {static kio_addr_t base[5 ] = {0x3f8 ,0x2f8 ,0x3e8 ,0x2e8 ,0x0 };bt3c_info_t *info = link->priv;
@@ -809,13 +807,14 @@ found_port: link->dev_node = &info->node; link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:bt3c_release (link); +return -ENODEV ; }
@@ -841,7 +840,7 @@ static struct pcmcia_driver bt3c_driver .drv = { .name = "bt3c_cs", }, - .probe = bt3c_attach, + .probe = bt3c_probe, .remove = bt3c_detach, .id_table = bt3c_ids, };
drivers/bluetooth/btuart_cs.c +7 -8
@@ -84,7 +84,7 @@ typedef struct btuart_info_t { } btuart_info_t; -static void btuart_config (struct pcmcia_device *link); +static int btuart_config (struct pcmcia_device *link);static void btuart_release (struct pcmcia_device *link);static void btuart_detach (struct pcmcia_device *p_dev);
@@ -576,7 +576,7 @@ static int btuart_close(btuart_info_t *ireturn 0 ; } -static int btuart_attach (struct pcmcia_device *link) +static int btuart_probe (struct pcmcia_device *link) {btuart_info_t *info;
@@ -600,9 +600,7 @@ static int btuart_attach(struct pcmcia_d link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -btuart_config (link); - -return 0 ; +return btuart_config (link); }
@@ -641,7 +639,7 @@ static int next_tuple(struct pcmcia_devireturn get_tuple (handle, tuple, parse); } -static void btuart_config (struct pcmcia_device *link) +static int btuart_config (struct pcmcia_device *link) {static kio_addr_t base[5 ] = {0x3f8 ,0x2f8 ,0x3e8 ,0x2e8 ,0x0 };btuart_info_t *info = link->priv;
@@ -741,13 +739,14 @@ found_port: link->dev_node = &info->node; link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:btuart_release (link); +return -ENODEV ; }
@@ -772,7 +771,7 @@ static struct pcmcia_driver btuart_drive .drv = { .name = "btuart_cs", }, - .probe = btuart_attach, + .probe = btuart_probe, .remove = btuart_detach, .id_table = btuart_ids, };
drivers/bluetooth/dtl1_cs.c +7 -8
@@ -87,7 +87,7 @@ typedef struct dtl1_info_t { } dtl1_info_t; -static void dtl1_config (struct pcmcia_device *link); +static int dtl1_config (struct pcmcia_device *link);static void dtl1_release (struct pcmcia_device *link);static void dtl1_detach (struct pcmcia_device *p_dev);
@@ -555,7 +555,7 @@ static int dtl1_close(dtl1_info_t *info)return 0 ; } -static int dtl1_attach (struct pcmcia_device *link) +static int dtl1_probe (struct pcmcia_device *link) {dtl1_info_t *info;
@@ -579,9 +579,7 @@ static int dtl1_attach(struct pcmcia_dev link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -dtl1_config (link); - -return 0 ; +return dtl1_config (link); }
@@ -620,7 +618,7 @@ static int next_tuple(struct pcmcia_devireturn get_tuple (handle, tuple, parse); } -static void dtl1_config (struct pcmcia_device *link) +static int dtl1_config (struct pcmcia_device *link) {dtl1_info_t *info = link->priv;tuple_t tuple;
@@ -693,13 +691,14 @@ static void dtl1_config(struct pcmcia_de link->dev_node = &info->node; link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:dtl1_release (link); +return -ENODEV ; }
@@ -727,7 +726,7 @@ static struct pcmcia_driver dtl1_driver .drv = { .name = "dtl1_cs", }, - .probe = dtl1_attach, + .probe = dtl1_probe, .remove = dtl1_detach, .id_table = dtl1_ids, };
drivers/char/pcmcia/cm4000_cs.c +9 -6
@@ -1759,7 +1759,7 @@ static void cmm_cm4000_release(struct pc/*==== Interface to PCMCIA Layer =======================================*/ -static void cm4000_config (struct pcmcia_device * link,int devno) +static int cm4000_config (struct pcmcia_device * link,int devno) {struct cm4000_dev *dev;tuple_t tuple;
@@ -1846,7 +1846,7 @@ static void cm4000_config(struct pcmcia_ link->dev_node = &dev->node; link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, fail_fn, fail_rc);
@@ -1854,6 +1854,7 @@ cs_release:cm4000_release (link); link->state &= ~DEV_CONFIG_PENDING ; +return -ENODEV ; }static int cm4000_suspend (struct pcmcia_device *link)
@@ -1883,10 +1884,10 @@ static void cm4000_release(struct pcmciapcmcia_disable_device (link); } -static int cm4000_attach (struct pcmcia_device *link) +static int cm4000_probe (struct pcmcia_device *link) {struct cm4000_dev *dev; -int i; +int i, ret;for (i =0 ; i <CM4000_MAX_DEV ; i++)if (dev_table[i] ==NULL )
@@ -1913,7 +1914,9 @@ static int cm4000_attach(struct pcmcia_dinit_waitqueue_head (&dev->readq); link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -cm4000_config (link, i); + ret =cm4000_config (link, i); +if (ret) +return ret;class_device_create (cmm_class,NULL ,MKDEV (major, i),NULL ,"cmm%d" , i);
@@ -1968,7 +1971,7 @@ static struct pcmcia_driver cm4000_drive .drv = { .name ="cm4000_cs" , }, - .probe = cm4000_attach, + .probe = cm4000_probe, .remove = cm4000_detach, .suspend = cm4000_suspend, .resume = cm4000_resume,
drivers/char/pcmcia/cm4040_cs.c +9 -6
@@ -514,7 +514,7 @@ static void cm4040_reader_release(structreturn ; } -static void reader_config (struct pcmcia_device *link,int devno) +static int reader_config (struct pcmcia_device *link,int devno) {struct reader_dev *dev;tuple_t tuple;
@@ -610,13 +610,14 @@ static void reader_config(struct pcmcia_ link->io.BasePort1, link->io.BasePort1+link->io.NumPorts1);DEBUGP (2 , dev,"<- reader_config (succ)\n" ); -return ; +return 0 ; cs_failed:cs_error (link, fail_fn, fail_rc); cs_release:reader_release (link); link->state &= ~DEV_CONFIG_PENDING ; +return -ENODEV ; }static void reader_release (struct pcmcia_device *link)
@@ -625,10 +626,10 @@ static void reader_release(struct pcmciapcmcia_disable_device (link); } -static int reader_attach (struct pcmcia_device *link) +static int reader_probe (struct pcmcia_device *link) {struct reader_dev *dev; -int i; +int i, ret;for (i =0 ; i <CM_MAX_DEV ; i++) {if (dev_table[i] ==NULL )
@@ -659,7 +660,9 @@ static int reader_attach(struct pcmcia_d dev->poll_timer.function = &cm4040_do_poll; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -reader_config (link, i); + ret =reader_config (link, i); +if (ret) +return ret;class_device_create (cmx_class,NULL ,MKDEV (major, i),NULL ,"cmx%d" , i);
@@ -715,7 +718,7 @@ static struct pcmcia_driver reader_drive .drv = { .name = "cm4040_cs", }, - .probe = reader_attach, + .probe = reader_probe, .remove = reader_detach, .id_table = cm4040_ids, };
drivers/char/pcmcia/synclink_cs.c +10 -6
@@ -484,7 +484,7 @@ static void mgslpc_wait_until_sent(struc/* PCMCIA prototypes */ -static void mgslpc_config (struct pcmcia_device *link); +static int mgslpc_config (struct pcmcia_device *link);static void mgslpc_release (u_long arg);static void mgslpc_detach (struct pcmcia_device *p_dev);
@@ -533,9 +533,10 @@ static void ldisc_receive_buf(struct tty } } -static int mgslpc_attach (struct pcmcia_device *link) +static int mgslpc_probe (struct pcmcia_device *link) {MGSLPC_INFO *info; +int ret;if (debug_level >=DEBUG_LEVEL_INFO )printk ("mgslpc_attach\n" );
@@ -578,7 +579,9 @@ static int mgslpc_attach(struct pcmcia_d link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -mgslpc_config (link); + ret =mgslpc_config (link); +if (ret) +return ret;mgslpc_add_device (info);
@@ -591,7 +594,7 @@ static int mgslpc_attach(struct pcmcia_d#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void mgslpc_config (struct pcmcia_device *link) +static int mgslpc_config (struct pcmcia_device *link) {MGSLPC_INFO *info = link->priv;tuple_t tuple;
@@ -680,11 +683,12 @@ static void mgslpc_config(struct pcmcia_printk ("\n" ); link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret);mgslpc_release ((u_long )link); +return -ENODEV ; }/* Card has been removed.
@@ -3003,7 +3007,7 @@ static struct pcmcia_driver mgslpc_drive .drv = { .name = "synclink_cs", }, - .probe = mgslpc_attach, + .probe = mgslpc_probe, .remove = mgslpc_detach, .id_table = mgslpc_ids, .suspend = mgslpc_suspend,
drivers/ide/legacy/ide-cs.c +7 -8
@@ -88,7 +88,7 @@ typedef struct ide_info_t { } ide_info_t;static void ide_release (struct pcmcia_device *); -static void ide_config (struct pcmcia_device *); +static int ide_config (struct pcmcia_device *);static void ide_detach (struct pcmcia_device *p_dev);
@@ -103,7 +103,7 @@ static void ide_detach(struct pcmcia_dev======================================================================*/ -static int ide_attach (struct pcmcia_device *link) +static int ide_probe (struct pcmcia_device *link) {ide_info_t *info;
@@ -126,9 +126,7 @@ static int ide_attach(struct pcmcia_devi link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -ide_config (link); - -return 0 ; +return ide_config (link); }/* ide_attach */ /*======================================================================
@@ -172,7 +170,7 @@ static int idecs_register(unsigned long#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void ide_config (struct pcmcia_device *link) +static int ide_config (struct pcmcia_device *link) {ide_info_t *info = link->priv;tuple_t tuple;
@@ -327,7 +325,7 @@ static void ide_config(struct pcmcia_dev link->state &= ~DEV_CONFIG_PENDING ;kfree (stk); -return ; +return 0 ; err_mem:printk (KERN_NOTICE "ide-cs: ide_config failed memory allocation\n" );
@@ -339,6 +337,7 @@ failed:kfree (stk);ide_release (link); link->state &= ~DEV_CONFIG_PENDING ; +return -ENODEV ; }/* ide_config */ /*======================================================================
@@ -424,7 +423,7 @@ static struct pcmcia_driver ide_cs_drive .drv = { .name = "ide-cs", }, - .probe = ide_attach, + .probe = ide_probe, .remove = ide_detach, .id_table = ide_ids, };
drivers/isdn/hardware/avm/avm_cs.c +10 -11
@@ -51,7 +51,7 @@ MODULE_LICENSE("GPL");handler. */ -static void avmcs_config (struct pcmcia_device *link); +static int avmcs_config (struct pcmcia_device *link);static void avmcs_release (struct pcmcia_device *link);/*
@@ -99,7 +99,7 @@ typedef struct local_info_t {======================================================================*/ -static int avmcs_attach (struct pcmcia_device *p_dev) +static int avmcs_probe (struct pcmcia_device *p_dev) {local_info_t *local;
@@ -128,12 +128,10 @@ static int avmcs_attach(struct pcmcia_de p_dev->priv = local; p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -avmcs_config (p_dev); - -return 0 ; +return avmcs_config (p_dev); err: -return -EINVAL ; +return -ENOMEM ; }/* avmcs_attach */ /*======================================================================
@@ -185,7 +183,7 @@ static int next_tuple(struct pcmcia_devireturn get_tuple (handle, tuple, parse); } -static void avmcs_config (struct pcmcia_device *link) +static int avmcs_config (struct pcmcia_device *link) {tuple_t tuple;cisparse_t parse;
@@ -219,7 +217,7 @@ static void avmcs_config(struct pcmcia_dif (i !=CS_SUCCESS ) {cs_error (link, ParseTuple, i); link->state &= ~DEV_CONFIG_PENDING ; -return ; +return -ENODEV ; }/* Configure card */
@@ -319,7 +317,7 @@ found_port:/* If any step failed, release any partially configured state */ if (i !=0 ) {avmcs_release (link); -return ; +return -ENODEV ; }
@@ -333,9 +331,10 @@ found_port:printk (KERN_ERR "avm_cs: failed to add AVM-%s-Controller at i/o %#x, irq %d\n" , dev->node.dev_name, link->io.BasePort1, link->irq.AssignedIRQ);avmcs_release (link); -return ; +return -ENODEV ; } dev->node.minor = i; +return 0 ; }/* avmcs_config */
@@ -367,7 +366,7 @@ static struct pcmcia_driver avmcs_driver .drv = { .name = "avm_cs", }, - .probe = avmcs_attach, + .probe = avmcs_probe, .remove = avmcs_detach, .id_table = avmcs_ids, };
drivers/isdn/hisax/avma1_cs.c +9 -10
@@ -67,7 +67,7 @@ module_param(isdnprot, int, 0);handler. */ -static void avma1cs_config (struct pcmcia_device *link); +static int avma1cs_config (struct pcmcia_device *link);static void avma1cs_release (struct pcmcia_device *link);/*
@@ -116,7 +116,7 @@ typedef struct local_info_t {======================================================================*/ -static int avma1cs_attach (struct pcmcia_device *p_dev) +static int avma1cs_probe (struct pcmcia_device *p_dev) {local_info_t *local;
@@ -150,9 +150,7 @@ static int avma1cs_attach(struct pcmcia_ p_dev->conf.Present =PRESENT_OPTION ; p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -avma1cs_config (p_dev); - -return 0 ; +return avma1cs_config (p_dev); }/* avma1cs_attach */ /*======================================================================
@@ -206,7 +204,7 @@ static int next_tuple(struct pcmcia_devireturn get_tuple (handle, tuple, parse); } -static void avma1cs_config (struct pcmcia_device *link) +static int avma1cs_config (struct pcmcia_device *link) {tuple_t tuple;cisparse_t parse;
@@ -242,7 +240,7 @@ static void avma1cs_config(struct pcmciaif (i !=CS_SUCCESS ) {cs_error (link, ParseTuple, i); link->state &= ~DEV_CONFIG_PENDING ; -return ; +return -ENODEV ; }/* Configure card */
@@ -325,7 +323,7 @@ found_port:/* If any step failed, release any partially configured state */ if (i !=0 ) {avma1cs_release (link); -return ; +return -ENODEV ; } printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n",
@@ -340,10 +338,11 @@ found_port:if (i <0 ) {printk (KERN_ERR "avma1_cs: failed to initialize AVM A1 PCMCIA %d at i/o %#x\n" , i, link->io.BasePort1);avma1cs_release (link); -return ; +return -ENODEV ; } dev->node.minor = i; +return 0 ; }/* avma1cs_config */ /*======================================================================
@@ -379,7 +378,7 @@ static struct pcmcia_driver avma1cs_driv .drv = { .name = "avma1_cs", }, - .probe = avma1cs_attach, + .probe = avma1cs_probe, .remove = avma1cs_detach, .id_table = avma1cs_ids, };
drivers/isdn/hisax/elsa_cs.c +7 -8
@@ -94,7 +94,7 @@ module_param(protocol, int, 0);handler. */ -static void elsa_cs_config (struct pcmcia_device *link); +static int elsa_cs_config (struct pcmcia_device *link);static void elsa_cs_release (struct pcmcia_device *link);/*
@@ -139,7 +139,7 @@ typedef struct local_info_t {======================================================================*/ -static int elsa_cs_attach (struct pcmcia_device *link) +static int elsa_cs_probe (struct pcmcia_device *link) {local_info_t *local;
@@ -175,9 +175,7 @@ static int elsa_cs_attach(struct pcmcia_ link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -elsa_cs_config (link); - -return 0 ; +return elsa_cs_config (link); }/* elsa_cs_attach */ /*======================================================================
@@ -235,7 +233,7 @@ static int next_tuple(struct pcmcia_devireturn get_tuple (handle, tuple, parse); } -static void elsa_cs_config (struct pcmcia_device *link) +static int elsa_cs_config (struct pcmcia_device *link) {tuple_t tuple;cisparse_t parse;
@@ -346,10 +344,11 @@ static void elsa_cs_config(struct pcmcia }else ((local_info_t *)link->priv)->cardnr = i; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, i);elsa_cs_release (link); +return -ENODEV ; }/* elsa_cs_config */ /*======================================================================
@@ -406,7 +405,7 @@ static struct pcmcia_driver elsa_cs_driv .drv = { .name = "elsa_cs", }, - .probe = elsa_cs_attach, + .probe = elsa_cs_probe, .remove = elsa_cs_detach, .id_table = elsa_ids, .suspend = elsa_suspend,
drivers/isdn/hisax/sedlbauer_cs.c +8 -8
@@ -95,7 +95,7 @@ module_param(protocol, int, 0);event handler. */ -static void sedlbauer_config (struct pcmcia_device *link); +static int sedlbauer_config (struct pcmcia_device *link);static void sedlbauer_release (struct pcmcia_device *link);/*
@@ -148,7 +148,7 @@ typedef struct local_info_t {======================================================================*/ -static int sedlbauer_attach (struct pcmcia_device *link) +static int sedlbauer_probe (struct pcmcia_device *link) {local_info_t *local;
@@ -187,9 +187,7 @@ static int sedlbauer_attach(struct pcmci link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -sedlbauer_config (link); - -return 0 ; +return sedlbauer_config (link); }/* sedlbauer_attach */ /*======================================================================
@@ -224,7 +222,7 @@ static void sedlbauer_detach(struct pcmc#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void sedlbauer_config (struct pcmcia_device *link) +static int sedlbauer_config (struct pcmcia_device *link) {local_info_t *dev = link->priv;tuple_t tuple;
@@ -423,14 +421,16 @@ static void sedlbauer_config(struct pcmcprintk (KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d at i/o %#x\n" , last_ret, link->io.BasePort1);sedlbauer_release (link); +return -ENODEV ; }else ((local_info_t *)link->priv)->cardnr = last_ret; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret);sedlbauer_release (link); +return -ENODEV ; }/* sedlbauer_config */
@@ -493,7 +493,7 @@ static struct pcmcia_driver sedlbauer_dr .drv = { .name = "sedlbauer_cs", }, - .probe = sedlbauer_attach, + .probe = sedlbauer_probe, .remove = sedlbauer_detach, .id_table = sedlbauer_ids, .suspend = sedlbauer_suspend,
drivers/isdn/hisax/teles_cs.c +11 -10
@@ -75,7 +75,7 @@ module_param(protocol, int, 0);handler. */ -static void teles_cs_config (struct pcmcia_device *link); +static int teles_cs_config (struct pcmcia_device *link);static void teles_cs_release (struct pcmcia_device *link);/*
@@ -130,7 +130,7 @@ typedef struct local_info_t {======================================================================*/ -static int teles_attach (struct pcmcia_device *link) +static int teles_probe (struct pcmcia_device *link) {local_info_t *local;
@@ -165,9 +165,7 @@ static int teles_attach(struct pcmcia_de link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -teles_cs_config (link); - -return 0 ; +return teles_cs_config (link); }/* teles_attach */ /*======================================================================
@@ -225,7 +223,7 @@ static int next_tuple(struct pcmcia_devireturn get_tuple (handle, tuple, parse); } -static void teles_cs_config (struct pcmcia_device *link) +static int teles_cs_config (struct pcmcia_device *link) {tuple_t tuple;cisparse_t parse;
@@ -333,13 +331,16 @@ static void teles_cs_config(struct pcmciprintk (KERN_ERR "teles_cs: failed to initialize Teles PCMCIA %d at i/o %#x\n" , i, link->io.BasePort1);teles_cs_release (link); - }else - ((local_info_t *)link->priv)->cardnr = i; +return -ENODEV ; + } + + ((local_info_t *)link->priv)->cardnr = i; +return 0 ; -return ; cs_failed:cs_error (link, last_fn, i);teles_cs_release (link); +return -ENODEV ; }/* teles_cs_config */ /*======================================================================
@@ -396,7 +397,7 @@ static struct pcmcia_driver teles_cs_dri .drv = { .name = "teles_cs", }, - .probe = teles_attach, + .probe = teles_probe, .remove = teles_detach, .id_table = teles_ids, .suspend = teles_suspend,
drivers/mtd/maps/pcmciamtd.c +11 -12
@@ -487,7 +487,7 @@ static void card_settings(struct pcmciam#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void pcmciamtd_config (struct pcmcia_device *link) +static int pcmciamtd_config (struct pcmcia_device *link) {struct pcmciamtd_dev *dev = link->priv;struct mtd_info *mtd =NULL ;
@@ -561,7 +561,7 @@ static void pcmciamtd_config(struct pcmcif (!dev->win_size) {err ("Cant allocate memory window" );pcmciamtd_release (link); -return ; +return -ENODEV ; }DEBUG (1 ,"Allocated a window of %dKiB" , dev->win_size >>10 );
@@ -573,7 +573,7 @@ static void pcmciamtd_config(struct pcmcif (!dev->win_base) {err ("ioremap(%lu, %u) failed" , req.Base, req.Size);pcmciamtd_release (link); -return ; +return -ENODEV ; }DEBUG (1 ,"mapped window dev = %p req.base = 0x%lx base = %p size = 0x%x" , dev, req.Base, dev->win_base, req.Size);
@@ -605,6 +605,7 @@ static void pcmciamtd_config(struct pcmc ret =pcmcia_request_configuration (link, &link->conf);if (ret !=CS_SUCCESS ) {cs_error (link, RequestConfiguration, ret); +return -ENODEV ; }if (mem_type ==1 ) {
@@ -625,7 +626,7 @@ static void pcmciamtd_config(struct pcmcif (!mtd) {DEBUG (1 ,"Cant find an MTD" );pcmciamtd_release (link); -return ; +return -ENODEV ; } dev->mtd_info = mtd;
@@ -668,19 +669,19 @@ static void pcmciamtd_config(struct pcmc dev->mtd_info =NULL ;err ("Couldnt register MTD device" );pcmciamtd_release (link); -return ; +return -ENODEV ; }snprintf (dev->node.dev_name,sizeof (dev->node.dev_name),"mtd%d" , mtd->index);info ("mtd%d: %s" , mtd->index, mtd->name); link->state &= ~DEV_CONFIG_PENDING ; link->dev_node = &dev->node; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret);err ("CS Error, exiting" );pcmciamtd_release (link); -return ; +return -ENODEV ; }
@@ -730,7 +731,7 @@ static void pcmciamtd_detach(struct pcmc* with Card Services. */ -static int pcmciamtd_attach (struct pcmcia_device *link) +static int pcmciamtd_probe (struct pcmcia_device *link) {struct pcmciamtd_dev *dev;
@@ -747,9 +748,7 @@ static int pcmciamtd_attach(struct pcmci link->conf.IntType =INT_MEMORY ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -pcmciamtd_config (link); - -return 0 ; +return pcmciamtd_config (link); }static struct pcmcia_device_id pcmciamtd_ids[] = {
@@ -783,7 +782,7 @@ static struct pcmcia_driver pcmciamtd_dr .drv = { .name ="pcmciamtd" }, - .probe = pcmciamtd_attach, + .probe = pcmciamtd_probe, .remove = pcmciamtd_detach, .owner = THIS_MODULE, .id_table = pcmciamtd_ids,
drivers/net/pcmcia/3c574_cs.c +7 -9
@@ -225,7 +225,7 @@ static char mii_preamble_required = 0;/* Index of functions. */ -static void tc574_config (struct pcmcia_device *link); +static int tc574_config (struct pcmcia_device *link);static void tc574_release (struct pcmcia_device *link);static void mdio_sync (kio_addr_t ioaddr,int bits);
@@ -256,7 +256,7 @@ static void tc574_detach(struct pcmcia_dwith Card Services. */ -static int tc574_attach (struct pcmcia_device *link) +static int tc574_probe (struct pcmcia_device *link) {struct el3_private *lp;struct net_device *dev;
@@ -297,9 +297,7 @@ static int tc574_attach(struct pcmcia_de#endif link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -tc574_config (link); - -return 0 ; +return tc574_config (link); }/* tc574_attach */ /*
@@ -337,7 +335,7 @@ static void tc574_detach(struct pcmcia_dstatic const char *ram_split[] = {"5:3" ,"3:1" ,"1:1" ,"3:5" }; -static void tc574_config (struct pcmcia_device *link) +static int tc574_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;struct el3_private *lp =netdev_priv (dev);
@@ -486,13 +484,13 @@ static void tc574_config(struct pcmcia_d8 << config.u.ram_size, ram_split[config.u.ram_split], config.u.autoselect ? "autoselect " : ""); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:tc574_release (link); -return ; +return -ENODEV ; }/* tc574_config */
@@ -1223,7 +1221,7 @@ static struct pcmcia_driver tc574_driver .drv = { .name = "3c574_cs", }, - .probe = tc574_attach, + .probe = tc574_probe, .remove = tc574_detach, .id_table = tc574_ids, .suspend = tc574_suspend,
drivers/net/pcmcia/3c589_cs.c +7 -10
@@ -142,7 +142,7 @@ DRV_NAME ".c " DRV_VERSION " 2001/10/13/*====================================================================*/ -static void tc589_config (struct pcmcia_device *link); +static int tc589_config (struct pcmcia_device *link);static void tc589_release (struct pcmcia_device *link);static u16 read_eeprom (kio_addr_t ioaddr,int index);
@@ -170,7 +170,7 @@ static void tc589_detach(struct pcmcia_d======================================================================*/ -static int tc589_attach (struct pcmcia_device *link) +static int tc589_probe (struct pcmcia_device *link) {struct el3_private *lp;struct net_device *dev;
@@ -212,9 +212,7 @@ static int tc589_attach(struct pcmcia_deSET_ETHTOOL_OPS (dev, &netdev_ethtool_ops); link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -tc589_config (link); - -return 0 ; +return tc589_config (link); }/* tc589_attach */ /*======================================================================
@@ -252,7 +250,7 @@ static void tc589_detach(struct pcmcia_d#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void tc589_config (struct pcmcia_device *link) +static int tc589_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;struct el3_private *lp =netdev_priv (dev);
@@ -359,14 +357,13 @@ static void tc589_config(struct pcmcia_dprintk (KERN_INFO " %dK FIFO split %s Rx:Tx, %s xcvr\n" , (fifo &7 ) ?32 :8 , ram_split[(fifo >>16 ) &3 ], if_names[dev->if_port]); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:tc589_release (link); -return ; - +return -ENODEV ; }/* tc589_config */ /*======================================================================
@@ -997,7 +994,7 @@ static struct pcmcia_driver tc589_driver .drv = { .name = "3c589_cs", }, - .probe = tc589_attach, + .probe = tc589_probe, .remove = tc589_detach, .id_table = tc589_ids, .suspend = tc589_suspend,
drivers/net/pcmcia/axnet_cs.c +7 -9
@@ -86,7 +86,7 @@ static char *version =/*====================================================================*/ -static void axnet_config (struct pcmcia_device *link); +static int axnet_config (struct pcmcia_device *link);static void axnet_release (struct pcmcia_device *link);static int axnet_open (struct net_device *dev);static int axnet_close (struct net_device *dev);
@@ -142,7 +142,7 @@ static inline axnet_dev_t *PRIV(struct n======================================================================*/ -static int axnet_attach (struct pcmcia_device *link) +static int axnet_probe (struct pcmcia_device *link) {axnet_dev_t *info;struct net_device *dev;
@@ -169,9 +169,7 @@ static int axnet_attach(struct pcmcia_deSET_ETHTOOL_OPS (dev, &netdev_ethtool_ops); link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -axnet_config (link); - -return 0 ; +return axnet_config (link); }/* axnet_attach */ /*======================================================================
@@ -288,7 +286,7 @@ static int try_io_port(struct pcmcia_dev } } -static void axnet_config (struct pcmcia_device *link) +static int axnet_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;axnet_dev_t *info =PRIV (dev);
@@ -425,14 +423,14 @@ static void axnet_config(struct pcmcia_d }else {printk (KERN_NOTICE " No MII transceivers found!\n" ); } -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:axnet_release (link); link->state &= ~DEV_CONFIG_PENDING ; -return ; +return -ENODEV ; }/* axnet_config */ /*======================================================================
@@ -806,7 +804,7 @@ static struct pcmcia_driver axnet_cs_dri .drv = { .name = "axnet_cs", }, - .probe = axnet_attach, + .probe = axnet_probe, .remove = axnet_detach, .id_table = axnet_ids, .suspend = axnet_suspend,
drivers/net/pcmcia/com20020_cs.c +7 -8
@@ -118,7 +118,7 @@ MODULE_LICENSE("GPL");/*====================================================================*/ -static void com20020_config (struct pcmcia_device *link); +static int com20020_config (struct pcmcia_device *link);static void com20020_release (struct pcmcia_device *link);static void com20020_detach (struct pcmcia_device *p_dev);
@@ -138,7 +138,7 @@ typedef struct com20020_dev_t {======================================================================*/ -static int com20020_attach (struct pcmcia_device *p_dev) +static int com20020_probe (struct pcmcia_device *p_dev) {com20020_dev_t *info;struct net_device *dev;
@@ -179,9 +179,7 @@ static int com20020_attach(struct pcmcia p_dev->priv = info; p_dev->state |=DEV_PRESENT ; -com20020_config (p_dev); - -return 0 ; +return com20020_config (p_dev); fail_alloc_dev:kfree (info);
@@ -250,7 +248,7 @@ static void com20020_detach(struct pcmci#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void com20020_config (struct pcmcia_device *link) +static int com20020_config (struct pcmcia_device *link) {struct arcnet_local *lp;tuple_t tuple;
@@ -345,13 +343,14 @@ static void com20020_config(struct pcmciDEBUG (1 ,KERN_INFO "%s: port %#3lx, irq %d\n" , dev->name, dev->base_addr, dev->irq); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:DEBUG (1 ,"com20020_config failed...\n" );com20020_release (link); +return -ENODEV ; }/* com20020_config */ /*======================================================================
@@ -404,7 +403,7 @@ static struct pcmcia_driver com20020_cs_ .drv = { .name = "com20020_cs", }, - .probe = com20020_attach, + .probe = com20020_probe, .remove = com20020_detach, .id_table = com20020_ids, .suspend = com20020_suspend,
drivers/net/pcmcia/fmvj18x_cs.c +7 -9
@@ -84,7 +84,7 @@ static char *version = DRV_NAME ".c " DR/* PCMCIA event handlers */ -static void fmvj18x_config (struct pcmcia_device *link); +static int fmvj18x_config (struct pcmcia_device *link);static int fmvj18x_get_hwinfo (struct pcmcia_device *link,u_char *node_id);static int fmvj18x_setup_mfc (struct pcmcia_device *link);static void fmvj18x_release (struct pcmcia_device *link);
@@ -228,7 +228,7 @@ typedef struct local_info_t {#define BANK_1U 0x24/* bank 1 (CONFIG_1) */ #define BANK_2U 0x28/* bank 2 (CONFIG_1) */ -static int fmvj18x_attach (struct pcmcia_device *link) +static int fmvj18x_probe (struct pcmcia_device *link) {local_info_t *lp;struct net_device *dev;
@@ -273,9 +273,7 @@ static int fmvj18x_attach(struct pcmcia_SET_ETHTOOL_OPS (dev, &netdev_ethtool_ops); link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -fmvj18x_config (link); - -return 0 ; +return fmvj18x_config (link); }/* fmvj18x_attach */ /*====================================================================*/
@@ -339,7 +337,7 @@ static int ungermann_try_io_port(structreturn ret;/* RequestIO failed */ } -static void fmvj18x_config (struct pcmcia_device *link) +static int fmvj18x_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;local_info_t *lp =netdev_priv (dev);
@@ -552,7 +550,7 @@ static void fmvj18x_config(struct pcmciafor (i =0 ; i <6 ; i++)printk ("%02X%s" , dev->dev_addr[i], ((i<5 ) ?":" :"\n" )); -return ; +return 0 ; cs_failed:/* All Card Services errors end up here */
@@ -560,7 +558,7 @@ cs_failed: failed:fmvj18x_release (link); link->state &= ~DEV_CONFIG_PENDING ; - +return -ENODEV ; }/* fmvj18x_config */ /*====================================================================*/
@@ -720,7 +718,7 @@ static struct pcmcia_driver fmvj18x_cs_d .drv = { .name = "fmvj18x_cs", }, - .probe = fmvj18x_attach, + .probe = fmvj18x_probe, .remove = fmvj18x_detach, .id_table = fmvj18x_ids, .suspend = fmvj18x_suspend,
drivers/net/pcmcia/ibmtr_cs.c +5 -6
@@ -105,7 +105,7 @@ MODULE_LICENSE("GPL");/*====================================================================*/ -static void ibmtr_config (struct pcmcia_device *link); +static int ibmtr_config (struct pcmcia_device *link);static void ibmtr_hw_setup (struct net_device *dev,u_int mmiobase);static void ibmtr_release (struct pcmcia_device *link);static void ibmtr_detach (struct pcmcia_device *p_dev);
@@ -174,9 +174,7 @@ static int ibmtr_attach(struct pcmcia_deSET_ETHTOOL_OPS (dev, &netdev_ethtool_ops); link->state |=DEV_PRESENT ; -ibmtr_config (link); - -return 0 ; +return ibmtr_config (link); }/* ibmtr_attach */ /*======================================================================
@@ -220,7 +218,7 @@ static void ibmtr_detach(struct pcmcia_d#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void ibmtr_config (struct pcmcia_device *link) +static int ibmtr_config (struct pcmcia_device *link) {ibmtr_dev_t *info = link->priv;struct net_device *dev = info->dev;
@@ -323,12 +321,13 @@ static void ibmtr_config(struct pcmcia_dfor (i =0 ; i <TR_ALEN ; i++)printk ("%02X" , dev->dev_addr[i]);printk ("\n" ); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:ibmtr_release (link); +return -ENODEV ; }/* ibmtr_config */ /*======================================================================
drivers/net/pcmcia/nmclan_cs.c +10 -13
@@ -417,7 +417,7 @@ INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);Function Prototypes ---------------------------------------------------------------------------- */ -static void nmclan_config (struct pcmcia_device *link); +static int nmclan_config (struct pcmcia_device *link);static void nmclan_release (struct pcmcia_device *link);static void nmclan_reset (struct net_device *dev);
@@ -443,7 +443,7 @@ nmclan_attachServices. ---------------------------------------------------------------------------- */ -static int nmclan_attach (struct pcmcia_device *link) +static int nmclan_probe (struct pcmcia_device *link) {mace_private *lp;struct net_device *dev;
@@ -488,9 +488,7 @@ static int nmclan_attach(struct pcmcia_d#endif link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -nmclan_config (link); - -return 0 ; +return nmclan_config (link); }/* nmclan_attach */ /* ----------------------------------------------------------------------------
@@ -655,7 +653,7 @@ nmclan_config#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void nmclan_config (struct pcmcia_device *link) +static int nmclan_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;mace_private *lp =netdev_priv (dev);
@@ -710,7 +708,7 @@ static void nmclan_config(struct pcmcia_printk (KERN_NOTICE "nmclan_cs: mace id not found: %x %x should" " be 0x40 0x?9\n" , sig[0 ], sig[1 ]); link->state &= ~DEV_CONFIG_PENDING ; -return ; +return -ENODEV ; } }
@@ -740,14 +738,13 @@ static void nmclan_config(struct pcmcia_ dev->name, dev->base_addr, dev->irq, if_names[dev->if_port]);for (i =0 ; i <6 ; i++)printk ("%02X%s" , dev->dev_addr[i], ((i<5 ) ?":" :"\n" )); -return ; +return 0 ; cs_failed: -cs_error (link, last_fn, last_ret); +cs_error (link, last_fn, last_ret); failed: -nmclan_release (link); -return ; - +nmclan_release (link); +return -ENODEV ; }/* nmclan_config */ /* ----------------------------------------------------------------------------
@@ -1611,7 +1608,7 @@ static struct pcmcia_driver nmclan_cs_dr .drv = { .name = "nmclan_cs", }, - .probe = nmclan_attach, + .probe = nmclan_probe, .remove = nmclan_detach, .id_table = nmclan_ids, .suspend = nmclan_suspend,
drivers/net/pcmcia/pcnet_cs.c +5 -7
@@ -103,7 +103,7 @@ module_param_array(hw_addr, int, NULL, 0/*====================================================================*/ static void mii_phy_probe (struct net_device *dev); -static void pcnet_config (struct pcmcia_device *link); +static int pcnet_config (struct pcmcia_device *link);static void pcnet_release (struct pcmcia_device *link);static int pcnet_open (struct net_device *dev);static int pcnet_close (struct net_device *dev);
@@ -265,9 +265,7 @@ static int pcnet_probe(struct pcmcia_dev dev->set_config = &set_config; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -pcnet_config (link); - -return 0 ; +return pcnet_config (link); }/* pcnet_attach */ /*======================================================================
@@ -516,7 +514,7 @@ static int try_io_port(struct pcmcia_dev } } -static void pcnet_config (struct pcmcia_device *link) +static int pcnet_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;pcnet_dev_t *info =PRIV (dev);
@@ -701,14 +699,14 @@ static void pcnet_config(struct pcmcia_dprintk (" hw_addr " );for (i =0 ; i <6 ; i++)printk ("%02X%s" , dev->dev_addr[i], ((i<5 ) ?":" :"\n" )); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:pcnet_release (link); link->state &= ~DEV_CONFIG_PENDING ; -return ; +return -ENODEV ; }/* pcnet_config */ /*======================================================================
drivers/net/pcmcia/smc91c92_cs.c +7 -9
@@ -279,7 +279,7 @@ enum RxCfg { RxAllMulti = 0x0004, RxProm/*====================================================================*/ static void smc91c92_detach (struct pcmcia_device *p_dev); -static void smc91c92_config (struct pcmcia_device *link); +static int smc91c92_config (struct pcmcia_device *link);static void smc91c92_release (struct pcmcia_device *link);static int smc_open (struct net_device *dev);
@@ -309,7 +309,7 @@ static struct ethtool_ops ethtool_ops;======================================================================*/ -static int smc91c92_attach (struct pcmcia_device *link) +static int smc91c92_probe (struct pcmcia_device *link) {struct smc_private *smc;struct net_device *dev;
@@ -357,9 +357,7 @@ static int smc91c92_attach(struct pcmcia smc->mii_if.reg_num_mask =0x1f ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -smc91c92_config (link); - -return 0 ; +return smc91c92_config (link); }/* smc91c92_attach */ /*======================================================================
@@ -972,7 +970,7 @@ static int check_sig(struct pcmcia_devic#define CS_EXIT_TEST (ret, svc, label) \ if (ret != CS_SUCCESS) { cs_error(link, svc, ret); goto label; } -static void smc91c92_config (struct pcmcia_device *link) +static int smc91c92_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;struct smc_private *smc =netdev_priv (dev);
@@ -1145,7 +1143,7 @@ static void smc91c92_config(struct pcmci } }kfree (cfg_mem); -return ; +return 0 ; config_undo:unregister_netdev (dev);
@@ -1153,7 +1151,7 @@ config_failed: /* CS_EXIT_TEST() callssmc91c92_release (link); link->state &= ~DEV_CONFIG_PENDING ;kfree (cfg_mem); - +return -ENODEV ; }/* smc91c92_config */ /*======================================================================
@@ -2289,7 +2287,7 @@ static struct pcmcia_driver smc91c92_cs_ .drv = { .name = "smc91c92_cs", }, - .probe = smc91c92_attach, + .probe = smc91c92_probe, .remove = smc91c92_detach, .id_table = smc91c92_ids, .suspend = smc91c92_suspend,
drivers/net/pcmcia/xirc2ps_cs.c +8 -9
@@ -290,7 +290,7 @@ static void mii_wr(kio_addr_t ioaddr, u_*/ static int has_ce2_string (struct pcmcia_device * link); -static void xirc2ps_config (struct pcmcia_device * link); +static int xirc2ps_config (struct pcmcia_device * link);static void xirc2ps_release (struct pcmcia_device * link);/****************
@@ -553,7 +553,7 @@ mii_wr(kio_addr_t ioaddr, u_char phyaddr*/ static int -xirc2ps_attach (struct pcmcia_device *link) +xirc2ps_probe (struct pcmcia_device *link) {struct net_device *dev;local_info_t *local;
@@ -592,9 +592,7 @@ xirc2ps_attach(struct pcmcia_device *lin#endif link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -xirc2ps_config (link); - -return 0 ; +return xirc2ps_config (link); }/* xirc2ps_attach */ /****************
@@ -731,7 +729,7 @@ has_ce2_string(struct pcmcia_device * li* is received, to configure the PCMCIA socket, and to make the * ethernet device available to the system. */ -static void +static int xirc2ps_config (struct pcmcia_device * link) {struct net_device *dev = link->priv;
@@ -1061,17 +1059,18 @@ xirc2ps_config(struct pcmcia_device * liprintk ("%c%02X" , i?':' :' ' , dev->dev_addr[i]);printk ("\n" ); -return ; +return 0 ; config_error: link->state &= ~DEV_CONFIG_PENDING ;xirc2ps_release (link); -return ; +return -ENODEV ; cis_error:printk (KNOT_XIRC "unable to parse CIS\n" ); failure: link->state &= ~DEV_CONFIG_PENDING ; +return -ENODEV ; }/* xirc2ps_config */ /****************
@@ -1911,7 +1910,7 @@ static struct pcmcia_driver xirc2ps_cs_d .drv = { .name = "xirc2ps_cs", }, - .probe = xirc2ps_attach, + .probe = xirc2ps_probe, .remove = xirc2ps_detach, .id_table = xirc2ps_ids, .suspend = xirc2ps_suspend,
drivers/net/wireless/airo_cs.c +8 -10
@@ -80,7 +80,7 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4event handler. */ -static void airo_config (struct pcmcia_device *link); +static int airo_config (struct pcmcia_device *link);static void airo_release (struct pcmcia_device *link);/*
@@ -141,7 +141,7 @@ typedef struct local_info_t {======================================================================*/ -static int airo_attach (struct pcmcia_device *p_dev) +static int airo_probe (struct pcmcia_device *p_dev) {local_info_t *local;
@@ -171,9 +171,7 @@ static int airo_attach(struct pcmcia_dev p_dev->priv = local; p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -airo_config (p_dev); - -return 0 ; +return airo_config (p_dev); }/* airo_attach */ /*======================================================================
@@ -211,7 +209,7 @@ static void airo_detach(struct pcmcia_de#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void airo_config (struct pcmcia_device *link) +static int airo_config (struct pcmcia_device *link) {tuple_t tuple;cisparse_t parse;
@@ -386,12 +384,12 @@ static void airo_config(struct pcmcia_deprintk ("\n" ); link->state &= ~DEV_CONFIG_PENDING ; -return ; - +return 0 ; + cs_failed:cs_error (link, last_fn, last_ret);airo_release (link); - +return -ENODEV ; }/* airo_config */ /*======================================================================
@@ -444,7 +442,7 @@ static struct pcmcia_driver airo_driver .drv = { .name = "airo_cs", }, - .probe = airo_attach, + .probe = airo_probe, .remove = airo_detach, .id_table = airo_ids, .suspend = airo_suspend,
drivers/net/wireless/atmel_cs.c +7 -8
@@ -91,7 +91,7 @@ MODULE_SUPPORTED_DEVICE("Atmel at76c50xevent handler. */ -static void atmel_config (struct pcmcia_device *link); +static int atmel_config (struct pcmcia_device *link);static void atmel_release (struct pcmcia_device *link);/*
@@ -152,7 +152,7 @@ typedef struct local_info_t {======================================================================*/ -static int atmel_attach (struct pcmcia_device *p_dev) +static int atmel_probe (struct pcmcia_device *p_dev) {local_info_t *local;
@@ -182,9 +182,7 @@ static int atmel_attach(struct pcmcia_de p_dev->priv = local; p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -atmel_config (p_dev); - -return 0 ; +return atmel_config (p_dev); }/* atmel_attach */ /*======================================================================
@@ -230,7 +228,7 @@ static int card_present(void *arg)return 0 ; } -static void atmel_config (struct pcmcia_device *link) +static int atmel_config (struct pcmcia_device *link) {tuple_t tuple;cisparse_t parse;
@@ -377,11 +375,12 @@ static void atmel_config(struct pcmcia_d link->dev_node = &dev->node; link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret);atmel_release (link); +return -ENODEV ; }/*======================================================================
@@ -476,7 +475,7 @@ static struct pcmcia_driver atmel_driver .drv = { .name ="atmel_cs" , }, - .probe = atmel_attach, + .probe = atmel_probe, .remove = atmel_detach, .id_table = atmel_ids, .suspend = atmel_suspend,
drivers/net/wireless/hostap/hostap_cs.c +8 -4
@@ -501,16 +501,20 @@ static struct prism2_helper_functions pr/* allocate local data and register with CardServices * initialize dev_link structure, but do not configure the card yet */ -static int prism2_attach (struct pcmcia_device *p_dev) +static int hostap_cs_probe (struct pcmcia_device *p_dev) { +int ret; +PDEBUG (DEBUG_HW ,"%s: setting Vcc=33 (constant)\n" , dev_info); p_dev->conf.IntType =INT_MEMORY_AND_IO ; p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -if (prism2_config (p_dev)) + ret =prism2_config (p_dev); +if (ret) {PDEBUG (DEBUG_EXTRA ,"prism2_config() failed\n" ); + } -return 0 ; +return ret; }
@@ -894,7 +898,7 @@ static struct pcmcia_driver hostap_drive .drv = { .name = "hostap_cs", }, - .probe = prism2_attach, + .probe = hostap_cs_probe, .remove = prism2_detach, .owner = THIS_MODULE, .id_table = hostap_cs_ids,
drivers/net/wireless/netwave_cs.c +7 -8
@@ -191,7 +191,7 @@ module_param(mem_speed, int, 0);/* PCMCIA (Card Services) related functions */ static void netwave_release (struct pcmcia_device *link);/* Card removal */ -static void netwave_pcmcia_config (struct pcmcia_device *arg);/* Runs after card +static int netwave_pcmcia_config (struct pcmcia_device *arg);/* Runs after card insertion */ static void netwave_detach (struct pcmcia_device *p_dev);/* Destroy instance */
@@ -376,7 +376,7 @@ static struct iw_statistics *netwave_get* configure the card at this point -- we wait until we receive a * card insertion event. */ -static int netwave_attach (struct pcmcia_device *link) +static int netwave_probe (struct pcmcia_device *link) {struct net_device *dev;netwave_private *priv;
@@ -429,9 +429,7 @@ static int netwave_attach(struct pcmcia_ link->irq.Instance = dev; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -netwave_pcmcia_config ( link); - -return 0 ; +return netwave_pcmcia_config ( link); }/* netwave_attach */ /*
@@ -737,7 +735,7 @@ static const struct iw_handler_def netwa#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void netwave_pcmcia_config (struct pcmcia_device *link) { +static int netwave_pcmcia_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;netwave_private *priv =netdev_priv (dev);tuple_t tuple;
@@ -845,12 +843,13 @@ static void netwave_pcmcia_config(structprintk (KERN_DEBUG "Netwave_reset: revision %04x %04x\n" ,get_uint16 (ramBase +NETWAVE_EREG_ARW ),get_uint16 (ramBase +NETWAVE_EREG_ARW +2 )); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:netwave_release (link); +return -ENODEV ; }/* netwave_pcmcia_config */ /*
@@ -1387,7 +1386,7 @@ static struct pcmcia_driver netwave_driv .drv = { .name = "netwave_cs", }, - .probe = netwave_attach, + .probe = netwave_probe, .remove = netwave_detach, .id_table = netwave_ids, .suspend = netwave_suspend,
drivers/net/wireless/orinoco_cs.c +7 -8
@@ -63,7 +63,7 @@ struct orinoco_pccard {/* Function prototypes */ /********************************************************************/ -static void orinoco_cs_config (struct pcmcia_device *link); +static int orinoco_cs_config (struct pcmcia_device *link);static void orinoco_cs_release (struct pcmcia_device *link);static void orinoco_cs_detach (struct pcmcia_device *p_dev);
@@ -104,7 +104,7 @@ orinoco_cs_hard_reset(struct orinoco_pri* configure the card at this point -- we wait until we receive a card * insertion event. */ static int -orinoco_cs_attach (struct pcmcia_device *link) +orinoco_cs_probe (struct pcmcia_device *link) {struct net_device *dev;struct orinoco_private *priv;
@@ -135,9 +135,7 @@ orinoco_cs_attach(struct pcmcia_device * link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -orinoco_cs_config (link); - -return 0 ; +return orinoco_cs_config (link); }/* orinoco_cs_attach */ /*
@@ -172,7 +170,7 @@ static void orinoco_cs_detach(struct pcm last_fn = (fn);if ((last_ret = (ret)) !=0 ) goto cs_failed; \ }while (0 ) -static void +static intorinoco_cs_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;
@@ -377,13 +375,14 @@ orinoco_cs_config(struct pcmcia_device * link->io.BasePort2 + link->io.NumPorts2 - 1);printk ("\n" ); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:orinoco_cs_release (link); +return -ENODEV ; }/* orinoco_cs_config */ /*
@@ -576,7 +575,7 @@ static struct pcmcia_driver orinoco_driv .drv = { .name = DRIVER_NAME, }, - .probe = orinoco_cs_attach, + .probe = orinoco_cs_probe, .remove = orinoco_cs_detach, .id_table = orinoco_cs_ids, .suspend = orinoco_cs_suspend,
drivers/net/wireless/ray_cs.c +9 -10
@@ -90,7 +90,7 @@ module_param(pc_debug, int, 0); #define DEBUG(n, args...)#endif /** Prototypes based on PCMCIA skeleton driver *******************************/ -static void ray_config (struct pcmcia_device *link); +static int ray_config (struct pcmcia_device *link);static void ray_release (struct pcmcia_device *link);static void ray_detach (struct pcmcia_device *p_dev);
@@ -303,7 +303,7 @@ static char rcsid[] = "Raylink/WebGear wconfigure the card at this point -- we wait until we receive a card insertion event. =============================================================================*/ -static int ray_attach (struct pcmcia_device *p_dev) +static int ray_probe (struct pcmcia_device *p_dev) {ray_dev_t *local;struct net_device *dev;
@@ -368,9 +368,7 @@ static int ray_attach(struct pcmcia_devi p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; this_device = p_dev; -ray_config (p_dev); - -return 0 ; +return ray_config (p_dev); fail_alloc_dev:return -ENOMEM ;
@@ -412,7 +410,7 @@ static void ray_detach(struct pcmcia_dev#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)#define MAX_TUPLE_SIZE 128 -static void ray_config (struct pcmcia_device *link) +static int ray_config (struct pcmcia_device *link) {tuple_t tuple;cisparse_t parse;
@@ -499,7 +497,7 @@ static void ray_config(struct pcmcia_devDEBUG (3 ,"ray_config amem=%p\n" ,local->amem);if (ray_init (dev) <0 ) {ray_release (link); -return ; +return -ENODEV ; }SET_NETDEV_DEV (dev, &handle_to_dev (link));
@@ -507,7 +505,7 @@ static void ray_config(struct pcmcia_devif (i !=0 ) {printk ("ray_config register_netdev() failed\n" );ray_release (link); -return ; +return i; }strcpy (local->node.dev_name, dev->name);
@@ -519,12 +517,13 @@ static void ray_config(struct pcmcia_devfor (i =0 ; i <6 ; i++)printk ("%02X%s" , dev->dev_addr[i], ((i<5 ) ?":" :"\n" )); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret);ray_release (link); +return -ENODEV ; }/* ray_config */ static inline struct ccs __iomem *ccs_base (ray_dev_t *dev)
@@ -2846,7 +2845,7 @@ static struct pcmcia_driver ray_driver = .drv = { .name = "ray_cs", }, - .probe = ray_attach, + .probe = ray_probe, .remove = ray_detach, .id_table = ray_ids, .suspend = ray_suspend,
drivers/net/wireless/spectrum_cs.c +7 -8
@@ -71,7 +71,7 @@ struct orinoco_pccard {/* Function prototypes */ /********************************************************************/ -static void spectrum_cs_config (struct pcmcia_device *link); +static int spectrum_cs_config (struct pcmcia_device *link);static void spectrum_cs_release (struct pcmcia_device *link);/********************************************************************/
@@ -583,7 +583,7 @@ spectrum_cs_hard_reset(struct orinoco_pr* configure the card at this point -- we wait until we receive a card * insertion event. */ static int -spectrum_cs_attach (struct pcmcia_device *link) +spectrum_cs_probe (struct pcmcia_device *link) {struct net_device *dev;struct orinoco_private *priv;
@@ -614,9 +614,7 @@ spectrum_cs_attach(struct pcmcia_device link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -spectrum_cs_config (link); - -return 0 ; +return spectrum_cs_config (link); }/* spectrum_cs_attach */ /*
@@ -647,7 +645,7 @@ static void spectrum_cs_detach(struct pc* device available to the system. */ -static void +static int spectrum_cs_config (struct pcmcia_device *link) {struct net_device *dev = link->priv;
@@ -857,13 +855,14 @@ spectrum_cs_config(struct pcmcia_device link->io.BasePort2 + link->io.NumPorts2 - 1);printk ("\n" ); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:spectrum_cs_release (link); +return -ENODEV ; }/* spectrum_cs_config */ /*
@@ -954,7 +953,7 @@ static struct pcmcia_driver orinoco_driv .drv = { .name = DRIVER_NAME, }, - .probe = spectrum_cs_attach, + .probe = spectrum_cs_probe, .remove = spectrum_cs_detach, .suspend = spectrum_cs_suspend, .resume = spectrum_cs_resume,
drivers/net/wireless/wavelan_cs.c +14 -6
@@ -4580,10 +4580,11 @@ wavelan_close(struct net_device * dev)* card insertion event. */ static int -wavelan_attach (struct pcmcia_device *p_dev) +wavelan_probe (struct pcmcia_device *p_dev) {struct net_device * dev;/* Interface generic data */ net_local * lp;/* Interface specific data */ +int ret;#ifdef DEBUG_CALLBACK_TRACE printk (KERN_DEBUG "-> wavelan_attach()\n" );
@@ -4651,11 +4652,18 @@ wavelan_attach(struct pcmcia_device *p_d dev->mtu =WAVELAN_MTU ; p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -if (wv_pcmcia_config (p_dev) && -wv_hw_config (dev)) -wv_init_info (dev); -else + ret =wv_pcmcia_config (p_dev); +if (ret) +return ret; + + ret =wv_hw_config (dev); +if (ret) { dev->irq =0 ; +pcmcia_disable_device (p_dev); +return ret; + } + +wv_init_info (dev);#ifdef DEBUG_CALLBACK_TRACE printk (KERN_DEBUG "<- wavelan_attach()\n" );
@@ -4760,7 +4768,7 @@ static struct pcmcia_driver wavelan_driv .drv = { .name = "wavelan_cs", }, - .probe = wavelan_attach, + .probe = wavelan_probe, .remove = wavelan_detach, .id_table = wavelan_ids, .suspend = wavelan_suspend,
drivers/net/wireless/wl3501_cs.c +8 -10
@@ -103,7 +103,7 @@ module_param(pc_debug, int, 0);* release a socket, in response to card insertion and ejection events. They * are invoked from the wl24 event handler. */ -static void wl3501_config (struct pcmcia_device *link); +static int wl3501_config (struct pcmcia_device *link);static void wl3501_release (struct pcmcia_device *link);/*
@@ -1920,7 +1920,7 @@ static const struct iw_handler_def wl350* The dev_link structure is initialized, but we don't actually configure the * card at this point -- we wait until we receive a card insertion event. */ -static int wl3501_attach (struct pcmcia_device *p_dev) +static int wl3501_probe (struct pcmcia_device *p_dev) {struct net_device *dev;struct wl3501_card *this;
@@ -1960,9 +1960,7 @@ static int wl3501_attach(struct pcmcia_d p_dev->priv = p_dev->irq.Instance = dev; p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -wl3501_config (p_dev); - -return 0 ; +return wl3501_config (p_dev); out_link:return -ENOMEM ; }
@@ -1978,7 +1976,7 @@ do { last_fn = (fn); if ((last_ret = (re* received, to configure the PCMCIA socket, and to make the ethernet device * available to the system. */ -static void wl3501_config (struct pcmcia_device *link) +static int wl3501_config (struct pcmcia_device *link) {tuple_t tuple;cisparse_t parse;
@@ -2082,13 +2080,13 @@ static void wl3501_config(struct pcmcia_spin_lock_init (&this->lock);init_waitqueue_head (&this->wait);netif_start_queue (dev); - goto out; +return 0 ; + cs_failed:cs_error (link, last_fn, last_ret); failed:wl3501_release (link); -out: -return ; +return -ENODEV ; }/**
@@ -2146,7 +2144,7 @@ static struct pcmcia_driver wl3501_drive .drv = { .name = "wl3501_cs", }, - .probe = wl3501_attach, + .probe = wl3501_probe, .remove = wl3501_detach, .id_table = wl3501_ids, .suspend = wl3501_suspend,
drivers/parport/parport_cs.c +8 -10
@@ -88,7 +88,7 @@ typedef struct parport_info_t { } parport_info_t;static void parport_detach (struct pcmcia_device *p_dev); -static void parport_config (struct pcmcia_device *link); +static int parport_config (struct pcmcia_device *link);static void parport_cs_release (struct pcmcia_device *);/*======================================================================
@@ -99,7 +99,7 @@ static void parport_cs_release(struct pc======================================================================*/ -static int parport_attach (struct pcmcia_device *link) +static int parport_probe (struct pcmcia_device *link) {parport_info_t *info;
@@ -120,9 +120,7 @@ static int parport_attach(struct pcmcia_ link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -parport_config (link); - -return 0 ; +return parport_config (link); }/* parport_attach */ /*======================================================================
@@ -155,7 +153,7 @@ static void parport_detach(struct pcmcia#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -void parport_config (struct pcmcia_device *link) +static int parport_config (struct pcmcia_device *link) {parport_info_t *info = link->priv;tuple_t tuple;
@@ -236,14 +234,14 @@ void parport_config(struct pcmcia_device link->dev_node = &info->node; link->state &= ~DEV_CONFIG_PENDING ; -return ; - +return 0 ; + cs_failed:cs_error (link, last_fn, last_ret); failed:parport_cs_release (link); link->state &= ~DEV_CONFIG_PENDING ; - +return -ENODEV ; }/* parport_config */ /*======================================================================
@@ -282,7 +280,7 @@ static struct pcmcia_driver parport_cs_d .drv = { .name = "parport_cs", }, - .probe = parport_attach, + .probe = parport_probe, .remove = parport_detach, .id_table = parport_ids, };
drivers/scsi/pcmcia/aha152x_stub.c +8 -11
@@ -96,11 +96,11 @@ typedef struct scsi_info_t {static void aha152x_release_cs (struct pcmcia_device *link);static void aha152x_detach (struct pcmcia_device *p_dev); -static void aha152x_config_cs (struct pcmcia_device *link); +static int aha152x_config_cs (struct pcmcia_device *link);static struct pcmcia_device *dev_list; -static int aha152x_attach (struct pcmcia_device *link) +static int aha152x_probe (struct pcmcia_device *link) {scsi_info_t *info;
@@ -123,9 +123,7 @@ static int aha152x_attach(struct pcmcia_ link->conf.Present =PRESENT_OPTION ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -aha152x_config_cs (link); - -return 0 ; +return aha152x_config_cs (link); }/* aha152x_attach */ /*====================================================================*/
@@ -146,7 +144,7 @@ static void aha152x_detach(struct pcmcia#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void aha152x_config_cs (struct pcmcia_device *link) +static int aha152x_config_cs (struct pcmcia_device *link) {scsi_info_t *info = link->priv;struct aha152x_setup s;
@@ -219,12 +217,12 @@ static void aha152x_config_cs(struct pcm info->host = host; link->state &= ~DEV_CONFIG_PENDING ; -return ; - +return 0 ; + cs_failed:cs_error (link, last_fn, last_ret);aha152x_release_cs (link); -return ; +return -ENODEV ; }static void aha152x_release_cs (struct pcmcia_device *link)
@@ -259,7 +257,7 @@ static struct pcmcia_driver aha152x_cs_d .drv = { .name = "aha152x_cs", }, - .probe = aha152x_attach, + .probe = aha152x_probe, .remove = aha152x_detach, .id_table = aha152x_ids, .resume = aha152x_resume,
@@ -278,4 +276,3 @@ static void __exit exit_aha152x_cs(void)module_init (init_aha152x_cs);module_exit (exit_aha152x_cs); -
drivers/scsi/pcmcia/fdomain_stub.c +33 -34
122 lines not on this page · raw message
drivers/scsi/pcmcia/nsp_cs.c +13 -8
@@ -1593,10 +1593,11 @@ static int nsp_eh_host_reset(Scsi_Cmnd *configure the card at this point -- we wait until we receive a card insertion event. ======================================================================*/ -static int nsp_cs_attach (struct pcmcia_device *link) +static int nsp_cs_probe (struct pcmcia_device *link) {scsi_info_t *info;nsp_hw_data *data = &nsp_data_base; +int ret;nsp_dbg (NSP_DEBUG_INIT ,"in" );
@@ -1630,10 +1631,10 @@ static int nsp_cs_attach(struct pcmcia_d link->conf.Present =PRESENT_OPTION ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -nsp_cs_config (link); + ret =nsp_cs_config (link);nsp_dbg (NSP_DEBUG_INIT ,"link=0x%p" , link); -return 0 ; +return ret; }/* nsp_cs_attach */
@@ -1665,8 +1666,9 @@ static void nsp_cs_detach(struct pcmcia_#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)/*====================================================================*/ -static void nsp_cs_config (struct pcmcia_device *link) +static int nsp_cs_config (struct pcmcia_device *link) { +int ret;scsi_info_t *info = link->priv;tuple_t tuple;cisparse_t parse;
@@ -1842,7 +1844,10 @@ static void nsp_cs_config(struct pcmcia_#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,5 ,74 )) -scsi_add_host (host,NULL ); + ret =scsi_add_host (host,NULL ); +if (ret) + goto cs_failed; +scsi_scan_host (host);snprintf (info->node.dev_name,sizeof (info->node.dev_name),"scsi%d" , host->host_no);
@@ -1917,14 +1922,14 @@ static void nsp_cs_config(struct pcmcia_printk ("\n" ); link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:nsp_dbg (NSP_DEBUG_INIT ,"config fail" );cs_error (link, last_fn, last_ret);nsp_cs_release (link); -return ; +return -ENODEV ; }/* nsp_cs_config */ #undef CS_CHECK
@@ -2033,7 +2038,7 @@ static struct pcmcia_driver nsp_driver = .drv = { .name = "nsp_cs", }, - .probe = nsp_cs_attach, + .probe = nsp_cs_probe, .remove = nsp_cs_detach, .id_table = nsp_cs_ids, .suspend = nsp_cs_suspend,
drivers/scsi/pcmcia/nsp_cs.h +1 -1
@@ -298,7 +298,7 @@ typedef struct _nsp_hw_data {/* Card service functions */ static void nsp_cs_detach (struct pcmcia_device *p_dev);static void nsp_cs_release (struct pcmcia_device *link); -static void nsp_cs_config (struct pcmcia_device *link); +static int nsp_cs_config (struct pcmcia_device *link);/* Linux SCSI subsystem specific functions */ static struct Scsi_Host *nsp_detect (struct scsi_host_template *sht);
drivers/scsi/pcmcia/qlogic_stub.c +8 -11
@@ -99,7 +99,7 @@ typedef struct scsi_info_t {static void qlogic_release (struct pcmcia_device *link);static void qlogic_detach (struct pcmcia_device *p_dev); -static void qlogic_config (struct pcmcia_device * link); +static int qlogic_config (struct pcmcia_device * link);static struct Scsi_Host *qlogic_detect (struct scsi_host_template *host,struct pcmcia_device *link,int qbase,int qlirq)
@@ -156,7 +156,7 @@ free_scsi_host: err:return NULL ; } -static int qlogic_attach (struct pcmcia_device *link) +static int qlogic_probe (struct pcmcia_device *link) {scsi_info_t *info;
@@ -179,9 +179,7 @@ static int qlogic_attach(struct pcmcia_d link->conf.Present =PRESENT_OPTION ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -qlogic_config (link); - -return 0 ; +return qlogic_config (link); }/* qlogic_attach */ /*====================================================================*/
@@ -202,7 +200,7 @@ static void qlogic_detach(struct pcmcia_#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void qlogic_config (struct pcmcia_device * link) +static int qlogic_config (struct pcmcia_device * link) {scsi_info_t *info = link->priv;tuple_t tuple;
@@ -267,21 +265,20 @@ static void qlogic_config(struct pcmcia_if (!host) {printk (KERN_INFO "%s: no SCSI devices found\n" , qlogic_name); - goto out; + goto cs_failed; }sprintf (info->node.dev_name,"scsi%d" , host->host_no); link->dev_node = &info->node; info->host = host; -out: link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret);pcmcia_disable_device (link); -return ; +return -ENODEV ; }/* qlogic_config */
@@ -350,7 +347,7 @@ static struct pcmcia_driver qlogic_cs_dr .drv = { .name = "qlogic_cs", }, - .probe = qlogic_attach, + .probe = qlogic_probe, .remove = qlogic_detach, .id_table = qlogic_ids, .resume = qlogic_resume,
drivers/scsi/pcmcia/sym53c500_cs.c +8 -11
@@ -707,7 +707,7 @@ static struct scsi_host_template sym53c5#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void +static int SYM53C500_config (struct pcmcia_device *link) {struct scsi_info_t *info = link->priv;
@@ -836,7 +836,8 @@ next_entry:scsi_scan_host (host); - goto out;/* SUCCESS */ + link->state &= ~DEV_CONFIG_PENDING ; +return 0 ; err_free_irq:free_irq (irq_level, host);
@@ -845,15 +846,13 @@ err_free_scsi: err_release:release_region (port_base,0x10 );printk (KERN_INFO "sym53c500_cs: no SCSI devices found\n" ); - -out: link->state &= ~DEV_CONFIG_PENDING ; -return ; +return -ENODEV ; cs_failed:cs_error (link, last_fn, last_ret);SYM53C500_release (link); -return ; +return -ENODEV ; }/* SYM53C500_config */ static int sym53c500_resume (struct pcmcia_device *link)
@@ -892,7 +891,7 @@ SYM53C500_detach(struct pcmcia_device *l }/* SYM53C500_detach */ static int -SYM53C500_attach (struct pcmcia_device *link) +SYM53C500_probe (struct pcmcia_device *link) {struct scsi_info_t *info;
@@ -915,9 +914,7 @@ SYM53C500_attach(struct pcmcia_device *l link->conf.Present =PRESENT_OPTION ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -SYM53C500_config (link); - -return 0 ; +return SYM53C500_config (link); }/* SYM53C500_attach */ MODULE_AUTHOR ("Bob Tracy <[email protected]>" );
@@ -937,7 +934,7 @@ static struct pcmcia_driver sym53c500_cs .drv = { .name = "sym53c500_cs", }, - .probe = SYM53C500_attach, + .probe = SYM53C500_probe, .remove = SYM53C500_detach, .id_table = sym53c500_ids, .resume = sym53c500_resume,
drivers/serial/serial_cs.c +5 -6
@@ -113,7 +113,7 @@ struct serial_cfg_mem { }; -static void serial_config (struct pcmcia_device * link); +static int serial_config (struct pcmcia_device * link);/*======================================================================
@@ -211,9 +211,7 @@ static int serial_probe(struct pcmcia_de link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -serial_config (link); - -return 0 ; +return serial_config (link); }/*======================================================================
@@ -553,7 +551,7 @@ free_cfg_mem:======================================================================*/ -void serial_config (struct pcmcia_device * link) +static int serial_config (struct pcmcia_device * link) {struct serial_info *info = link->priv;struct serial_cfg_mem *cfg_mem;
@@ -652,7 +650,7 @@ void serial_config(struct pcmcia_device link->dev_node = &info->node[0 ]; link->state &= ~DEV_CONFIG_PENDING ;kfree (cfg_mem); -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret);
@@ -660,6 +658,7 @@ void serial_config(struct pcmcia_deviceserial_remove (link); link->state &= ~DEV_CONFIG_PENDING ;kfree (cfg_mem); +return -ENODEV ; }static struct pcmcia_device_id serial_ids[] = {
drivers/telephony/ixj_pcmcia.c +7 -8
@@ -35,10 +35,10 @@ typedef struct ixj_info_t { } ixj_info_t;static void ixj_detach (struct pcmcia_device *p_dev); -static void ixj_config (struct pcmcia_device * link); +static int ixj_config (struct pcmcia_device * link);static void ixj_cs_release (struct pcmcia_device * link); -static int ixj_attach (struct pcmcia_device *p_dev) +static int ixj_probe (struct pcmcia_device *p_dev) {DEBUG (0 ,"ixj_attach()\n" );/* Create new ixj device */
@@ -53,9 +53,7 @@ static int ixj_attach(struct pcmcia_devimemset (p_dev->priv,0 ,sizeof (struct ixj_info_t )); p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -ixj_config (p_dev); - -return 0 ; +return ixj_config (p_dev); }static void ixj_detach (struct pcmcia_device *link)
@@ -133,7 +131,7 @@ static void ixj_get_serial(struct pcmciareturn ; } -static void ixj_config (struct pcmcia_device * link) +static int ixj_config (struct pcmcia_device * link) {IXJ *j;ixj_info_t *info;
@@ -198,10 +196,11 @@ static void ixj_config(struct pcmcia_dev link->dev_node = &info->node;ixj_get_serial (link, j); link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret);ixj_cs_release (link); +return -ENODEV ; }static void ixj_cs_release (struct pcmcia_device *link)
@@ -223,7 +222,7 @@ static struct pcmcia_driver ixj_driver = .drv = { .name = "ixj_cs", }, - .probe = ixj_attach, + .probe = ixj_probe, .remove = ixj_detach, .id_table = ixj_ids, };
drivers/usb/host/sl811_cs.c +6 -6
@@ -158,7 +158,7 @@ static void sl811_cs_release(struct pcmcplatform_device_unregister (&platform_dev); } -static void sl811_cs_config (struct pcmcia_device *link) +static int sl811_cs_config (struct pcmcia_device *link) {struct device *parent = &handle_to_dev (link);local_info_t *dev = link->priv;
@@ -285,10 +285,12 @@ cs_failed:cs_error (link, last_fn, last_ret);sl811_cs_release (link); link->state &= ~DEV_CONFIG_PENDING ; +return -ENODEV ; } +return 0 ; } -static int sl811_cs_attach (struct pcmcia_device *link) +static int sl811_cs_probe (struct pcmcia_device *link) {local_info_t *local;
@@ -308,9 +310,7 @@ static int sl811_cs_attach(struct pcmcia link->conf.IntType =INT_MEMORY_AND_IO ; link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -sl811_cs_config (link); - -return 0 ; +return sl811_cs_config (link); }static struct pcmcia_device_id sl811_ids[] = {
@@ -324,7 +324,7 @@ static struct pcmcia_driver sl811_cs_dri .drv = { .name = (char *)driver_name, }, - .probe = sl811_cs_attach, + .probe = sl811_cs_probe, .remove = sl811_cs_detach, .id_table = sl811_ids, };
sound/pcmcia/pdaudiocf/pdaudiocf.c +8 -9
@@ -57,7 +57,7 @@ static struct snd_card *card_list[SNDRV_/* * prototypes */ -static void pdacf_config (struct pcmcia_device *link); +static int pdacf_config (struct pcmcia_device *link);static void snd_pdacf_detach (struct pcmcia_device *p_dev);static void pdacf_release (struct pcmcia_device *link)
@@ -90,7 +90,7 @@ static int snd_pdacf_dev_free(struct snd/* * snd_pdacf_attach - attach callback for cs */ -static int snd_pdacf_attach (struct pcmcia_device *link) +static int snd_pdacf_probe (struct pcmcia_device *link) {int i;struct snd_pdacf *pdacf;
@@ -149,9 +149,7 @@ static int snd_pdacf_attach(struct pcmci link->conf.ConfigIndex =1 ; link->conf.Present =PRESENT_OPTION ; -pdacf_config (link); - -return 0 ; +return pdacf_config (link); }
@@ -218,7 +216,7 @@ static void snd_pdacf_detach(struct pcmc#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void pdacf_config (struct pcmcia_device *link) +static int pdacf_config (struct pcmcia_device *link) {struct snd_pdacf *pdacf = link->priv;tuple_t tuple;
@@ -230,7 +228,7 @@ static void pdacf_config(struct pcmcia_d parse =kmalloc (sizeof (*parse),GFP_KERNEL );if (! parse) {snd_printk (KERN_ERR "pdacf_config: cannot allocate\n" ); -return ; +return -ENOMEM ; } tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ; tuple.Attributes =0 ;
@@ -257,12 +255,13 @@ static void pdacf_config(struct pcmcia_d link->dev_node = &pdacf->node; link->state &= ~DEV_CONFIG_PENDING ; -return ; +return 0 ; cs_failed:cs_error (link, last_fn, last_ret); failed:pcmcia_disable_device (link); +return -ENODEV ; }#ifdef CONFIG_PM
@@ -312,7 +311,7 @@ static struct pcmcia_driver pdacf_cs_dri .drv = { .name = "snd-pdaudiocf", }, - .probe = snd_pdacf_attach, + .probe = snd_pdacf_probe, .remove = snd_pdacf_detach, .id_table = snd_pdacf_ids,#ifdef CONFIG_PM
sound/pcmcia/vx/vxpocket.c +7 -8
@@ -208,7 +208,7 @@ static int snd_vxpocket_assign_resources#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static void vxpocket_config (struct pcmcia_device *link) +static int vxpocket_config (struct pcmcia_device *link) {struct vx_core *chip = link->priv;struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip;
@@ -221,7 +221,7 @@ static void vxpocket_config(struct pcmci parse =kmalloc (sizeof (*parse),GFP_KERNEL );if (! parse) {snd_printk (KERN_ERR "vx: cannot allocate\n" ); -return ; +return -ENOMEM ; } tuple.Attributes =0 ; tuple.TupleData = (cisdata_t *)buf;
@@ -265,13 +265,14 @@ static void vxpocket_config(struct pcmci link->dev_node = &vxp->node; link->state &= ~DEV_CONFIG_PENDING ;kfree (parse); -return ; +return 9 ; cs_failed:cs_error (link, last_fn, last_ret); failed:pcmcia_disable_device (link);kfree (parse); +return -ENODEV ; }#ifdef CONFIG_PM
@@ -311,7 +312,7 @@ static int vxp_resume(struct pcmcia_devi/* */ -static int vxpocket_attach (struct pcmcia_device *p_dev) +static int vxpocket_probe (struct pcmcia_device *p_dev) {struct snd_card *card;struct snd_vxpocket *vxp;
@@ -349,9 +350,7 @@ static int vxpocket_attach(struct pcmcia vxp->p_dev = p_dev; vxp->p_dev->state |=DEV_PRESENT |DEV_CONFIG_PENDING ; -vxpocket_config (p_dev); - -return 0 ; +return vxpocket_config (p_dev); }static void vxpocket_detach (struct pcmcia_device *link)
@@ -387,7 +386,7 @@ static struct pcmcia_driver vxp_cs_drive .drv = { .name = "snd-vxpocket", }, - .probe = vxpocket_attach, + .probe = vxpocket_probe, .remove = vxpocket_detach, .id_table = vxp_ids,#ifdef CONFIG_PM
Signature · 1 line
1.2.4
Dominik Brodowski
maintainerPATCH 29/33 pcmcia: convert DEV_OK to pcmcia_dev_present
In reply to Dominik BrodowskiInstead of the DEV_OK macro, drivers should use pcmcia_dev_present().
---
drivers/char/pcmcia/cm4000_cs.c | 4 ++-- drivers/char/pcmcia/cm4040_cs.c | 2 +- drivers/net/pcmcia/3c574_cs.c | 4 ++-- drivers/net/pcmcia/3c589_cs.c | 8 ++++---- drivers/net/pcmcia/axnet_cs.c | 2 +- drivers/net/pcmcia/fmvj18x_cs.c | 2 +- drivers/net/pcmcia/nmclan_cs.c | 2 +- drivers/net/pcmcia/pcnet_cs.c | 2 +- drivers/net/pcmcia/smc91c92_cs.c | 2 +- drivers/net/pcmcia/xirc2ps_cs.c | 2 +- drivers/net/wireless/atmel_cs.c | 9 ++++----- drivers/net/wireless/hostap/hostap_cs.c | 2 +- drivers/net/wireless/netwave_cs.c | 4 ++-- drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/wl3501_cs.c | 2 +- drivers/pcmcia/ds.c | 27 +++++++++++++++++++++++++++ drivers/serial/serial_cs.c | 2 +- include/pcmcia/cs.h | 1 + include/pcmcia/ds.h | 12 ++++-------- sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 +- sound/pcmcia/vx/vxpocket.c | 2 +- 21 files changed, 59 insertions(+), 36 deletions(-)
9940ec3617fec1db13e589bbc3f37e37878c7683
drivers/char/pcmcia/cm4000_cs.c +2 -2
@@ -1458,7 +1458,7 @@ static int cmm_ioctl(struct inode *inode iminor(inode), ioctl_names[_IOC_NR(cmd)]); link = dev_table[iminor (inode)]; -if (!(DEV_OK (link))) { +if (!pcmcia_dev_present (link)) {DEBUGP (4 , dev,"DEV_OK false\n" );return -ENODEV ; }
@@ -1667,7 +1667,7 @@ static int cmm_open(struct inode *inode,return -ENODEV ; link = dev_table[minor]; -if (link ==NULL || !(DEV_OK (link))) +if (link ==NULL || !pcmcia_dev_present (link))return -ENODEV ;if (link->open)
drivers/char/pcmcia/cm4040_cs.c +1 -1
@@ -452,7 +452,7 @@ static int cm4040_open(struct inode *inoreturn -ENODEV ; link = dev_table[minor]; -if (link ==NULL || !(DEV_OK (link))) +if (link ==NULL || !pcmcia_dev_present (link))return -ENODEV ;if (link->open)
drivers/net/pcmcia/3c574_cs.c +2 -2
@@ -728,7 +728,7 @@ static int el3_open(struct net_device *dstruct el3_private *lp =netdev_priv (dev);struct pcmcia_device *link = lp->p_dev; -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link))return -ENODEV ; link->open++;
@@ -1176,7 +1176,7 @@ static int el3_close(struct net_device *DEBUG (2 ,"%s: shutting down ethercard.\n" , dev->name); -if (DEV_OK (link)) { +if (pcmcia_dev_present (link)) {unsigned long flags;/* Turn off statistics ASAP. We update lp->stats below. */
drivers/net/pcmcia/3c589_cs.c +4 -4
@@ -557,7 +557,7 @@ static int el3_open(struct net_device *dstruct el3_private *lp =netdev_priv (dev);struct pcmcia_device *link = lp->p_dev; -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link))return -ENODEV ; link->open++;
@@ -818,7 +818,7 @@ static struct net_device_stats *el3_get_unsigned long flags;struct pcmcia_device *link = lp->p_dev; -if (DEV_OK (link)) { +if (pcmcia_dev_present (link)) {spin_lock_irqsave (&lp->lock, flags);update_stats (dev);spin_unlock_irqrestore (&lp->lock, flags);
@@ -922,7 +922,7 @@ static void set_multicast_list(struct nekio_addr_t ioaddr = dev->base_addr;u16 opts = SetRxFilter | RxStation | RxBroadcast; -if (!(DEV_OK (link)))return ; +if (!pcmcia_dev_present (link))return ;if (dev->flags &IFF_PROMISC ) opts |= RxMulticast | RxProm;else if (dev->mc_count || (dev->flags &IFF_ALLMULTI ))
@@ -938,7 +938,7 @@ static int el3_close(struct net_device *DEBUG (1 ,"%s: shutting down ethercard.\n" , dev->name); -if (DEV_OK (link)) { +if (pcmcia_dev_present (link)) {/* Turn off statistics ASAP. We update lp->stats below. */ outw (StatsDisable, ioaddr +EL3_CMD );
drivers/net/pcmcia/axnet_cs.c +1 -1
@@ -530,7 +530,7 @@ static int axnet_open(struct net_deviceDEBUG (2 ,"axnet_open('%s')\n" , dev->name); -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link))return -ENODEV ; link->open++;
drivers/net/pcmcia/fmvj18x_cs.c +1 -1
@@ -1112,7 +1112,7 @@ static int fjn_open(struct net_device *dDEBUG (4 ,"fjn_open('%s').\n" , dev->name); -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link))return -ENODEV ; link->open++;
drivers/net/pcmcia/nmclan_cs.c +1 -1
@@ -853,7 +853,7 @@ static int mace_open(struct net_device *mace_private *lp =netdev_priv (dev);struct pcmcia_device *link = lp->p_dev; -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link))return -ENODEV ; link->open++;
drivers/net/pcmcia/pcnet_cs.c +1 -1
@@ -992,7 +992,7 @@ static int pcnet_open(struct net_deviceDEBUG (2 ,"pcnet_open('%s')\n" , dev->name); -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link))return -ENODEV ; link->open++;
drivers/net/pcmcia/smc91c92_cs.c +1 -1
@@ -1259,7 +1259,7 @@ static int smc_open(struct net_device *d#endif /* Check that the PCMCIA card is still here. */ -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link))return -ENODEV ;/* Physical device present signature. */ if (check_sig (link) <0 ) {
drivers/net/pcmcia/xirc2ps_cs.c +1 -1
@@ -1525,7 +1525,7 @@ do_open(struct net_device *dev)/* Check that the PCMCIA card is still here. */ /* Physical device present signature. */ -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link))return -ENODEV ;/* okay */
drivers/net/wireless/atmel_cs.c +4 -5
@@ -216,13 +216,12 @@ do { last_fn = (fn); if ((last_ret = (re/* Call-back function to interrogate PCMCIA-specific information about the current existance of the card */ static int card_present (void *arg) -{ +{struct pcmcia_device *link = (struct pcmcia_device *)arg; -if (link->suspended) -return 0 ; -else if (pcmcia_dev_present (link)) + +if (pcmcia_dev_present (link))return 1 ; - +return 0 ; }
drivers/net/wireless/hostap/hostap_cs.c +1 -1
@@ -210,7 +210,7 @@ static int prism2_config(struct pcmcia_dstatic int prism2_pccard_card_present (local_info_t *local) {struct hostap_cs_priv *hw_priv = local->hw_priv; -if (hw_priv !=NULL && hw_priv->link !=NULL &&DEV_OK (hw_priv->link)) +if (hw_priv !=NULL && hw_priv->link !=NULL &&pcmcia_dev_present (hw_priv->link))return 1 ;return 0 ; }
drivers/net/wireless/netwave_cs.c +2 -2
@@ -1107,7 +1107,7 @@ static irqreturn_t netwave_interrupt(int status =inb (iobase +NETWAVE_REG_ASR ); -if (!DEV_OK (link)) { +if (!pcmcia_dev_present (link)) {DEBUG (1 ,"netwave_interrupt: Interrupt with status 0x%x " "from removed or suspended card!\n" , status);break ;
@@ -1346,7 +1346,7 @@ static int netwave_open(struct net_devicDEBUG (1 ,"netwave_open: starting.\n" ); -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link))return -ENODEV ; link->open++;
drivers/net/wireless/ray_cs.c +1 -1
@@ -1961,7 +1961,7 @@ static irqreturn_t ray_interrupt(int irq local = (ray_dev_t *)dev->priv; link = (struct pcmcia_device *)local->finder; -if (!(pcmcia_dev_present (link)) || link->suspended ) { +if (!pcmcia_dev_present (link)) {DEBUG (2 ,"ray_cs interrupt from device not present or suspended.\n" );return IRQ_NONE ; }
drivers/net/wireless/wl3501_cs.c +1 -1
@@ -1387,7 +1387,7 @@ static int wl3501_open(struct net_device link = this->p_dev;spin_lock_irqsave (&this->lock, flags); -if (!DEV_OK (link)) +if (!pcmcia_dev_present (link)) goto out;netif_device_attach (dev); link->open++;
drivers/pcmcia/ds.c +27 -0
@@ -469,6 +469,7 @@ static void pcmcia_card_remove(struct pc } p_dev = list_entry((&s->devices_list)->next, struct pcmcia_device, socket_device_list);list_del (&p_dev->socket_device_list); + p_dev->_removed=1 ;spin_unlock_irqrestore (&pcmcia_dev_list_lock, flags);device_unregister (&p_dev->dev);
@@ -1163,6 +1164,32 @@ static int ds_event(struct pcmcia_socket }/* ds_event */ +struct pcmcia_device *pcmcia_dev_present (struct pcmcia_device *_p_dev) +{ +struct pcmcia_device *p_dev; +struct pcmcia_device *ret =NULL ; + + p_dev =pcmcia_get_dev (_p_dev); +if (!p_dev) +return NULL ; + +if (!p_dev->socket->pcmcia_state.present) + goto out; + +if (p_dev->_removed) + goto out; + +if (p_dev->suspended) + goto out; + + ret = p_dev; + out: +pcmcia_put_dev (p_dev); +return ret; +} +EXPORT_SYMBOL (pcmcia_dev_present); + +static struct pcmcia_callback pcmcia_bus_callback = { .owner =THIS_MODULE , .event = ds_event,
drivers/serial/serial_cs.c +1 -1
@@ -155,7 +155,7 @@ static int serial_suspend(struct pcmcia_static int serial_resume (struct pcmcia_device *link) { -if (DEV_OK (link)) { +if (pcmcia_dev_present (link)) {struct serial_info *info = link->priv;int i;
include/pcmcia/cs.h +1 -0
@@ -390,6 +390,7 @@ int pcmcia_eject_card(struct pcmcia_sockint pcmcia_insert_card (struct pcmcia_socket *skt);int pccard_reset_card (struct pcmcia_socket *skt); +struct pcmcia_device *pcmcia_dev_present (struct pcmcia_device *p_dev);void pcmcia_disable_device (struct pcmcia_device *p_dev);struct pcmcia_socket *pcmcia_get_socket (struct pcmcia_socket *skt);
include/pcmcia/ds.h +4 -8
@@ -104,12 +104,6 @@ typedef struct dev_node_t {struct dev_node_t *next; } dev_node_t; -#define pcmcia_dev_present (p_dev) \ - (p_dev->socket->pcmcia_state.present) - -#define DEV_OK (l) \ - ((l) && (!l->suspended) && pcmcia_dev_present(l)) -struct pcmcia_socket ;struct config_t ;
@@ -155,8 +149,10 @@ struct pcmcia_device {config_req_t conf;window_handle_t win; -/* Is the device suspended? */ +/* Is the device suspended, or in the process of +* being removed? */ u16 suspended:1; + u16 _removed:1;/* Flags whether io, irq, win configurations were * requested, and whether the configuration is "locked" */
@@ -174,7 +170,7 @@ struct pcmcia_device { u16 has_card_id:1; u16 has_func_id:1; - u16 reserved:4; + u16 reserved:3;u8 func_id;u16 manf_id;
sound/pcmcia/pdaudiocf/pdaudiocf.c +1 -1
@@ -280,7 +280,7 @@ static int pdacf_resume(struct pcmcia_destruct snd_pdacf *chip = link->priv;snd_printdd (KERN_DEBUG "RESUME\n" ); -if (DEV_OK (link)) { +if (pcmcia_dev_present (link)) {if (chip) {snd_printdd (KERN_DEBUG "calling snd_pdacf_resume\n" );snd_pdacf_resume (chip);
sound/pcmcia/vx/vxpocket.c +1 -1
@@ -291,7 +291,7 @@ static int vxp_resume(struct pcmcia_devistruct vx_core *chip = link->priv;snd_printdd (KERN_DEBUG "RESUME\n" ); -if (DEV_OK (link)) { +if (pcmcia_dev_present (link)) {//struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip; if (chip) {snd_printdd (KERN_DEBUG "calling snd_vx_resume\n" );
Signature · 9 lines
1.2.4 ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
Dominik Brodowski
maintainerPATCH 31/33 pcmcia: Add support for Possio GCC AKA PCMCIA Siemens MC45
In reply to Dominik BrodowskiFrom: Petr Vandrovec <[email protected]>
This ugly hack add support for Siemens MC45 PCMCIA GPRS card (which is identical to Possio GCC, and which is offered by one of our local GPRS providers). Card has unfortunate feature that after poweron oxcf950 chip is fully powered and works, but attached MC45 modem is powered down :-( There is a special sequence (which takes 1 sec :-( ) to poweron MC45 (and after MC45 powers on, it takes more than 2 secs until firmware fully boots...) which needs to be executed after all powerons.
I'm really not familiar with PCMCIA subsystem, so I have no idea whether I should issue request_region() on rest of oxcf950 address range (0-7 is UART, 8-F are special configuration registers), or how this should be better integrated with PM system and so on - I just put it in same place where another hack already lived...
Card uses 18.432MHz XTAL, so to get it to work you must add lines below to the /etc/pcmcia/serial.opts.
case "$MANFID-$FUNCID-$PRODID_1-$PRODID_2-$PRODID_3-$PRODID_4" in '030c,0003-2-GPRS-CARD--')
SERIAL_OPTS="baud_base 1152000"
;;esac
---
drivers/serial/serial_cs.c | 52 +++++++++++++++++++++++++++++++++++++++----- include/pcmcia/ciscode.h | 3 +++ 2 files changed, 49 insertions(+), 6 deletions(-)
30bac7aa0e3678c79ff00fc9372f34712eeb34fc
drivers/serial/serial_cs.c +46 -6
@@ -41,6 +41,7 @@#include <linux/string.h> #include <linux/timer.h> #include <linux/serial_core.h> +#include <linux/delay.h> #include <linux/major.h> #include <asm/io.h> #include <asm/system.h>
@@ -102,6 +103,8 @@ struct serial_info {int multi;int slave;int manfid; +int prodid; +int c950ctrl;dev_node_t node[4 ];int line[4 ]; };
@@ -116,6 +119,33 @@ struct serial_cfg_mem {static int serial_config (struct pcmcia_device * link); +static void wakeup_card (struct serial_info *info) +{ +int ctrl = info->c950ctrl; + +if (info->manfid ==MANFID_OXSEMI ) { +outb (12 , ctrl +1 ); + }else if (info->manfid ==MANFID_POSSIO && info->prodid ==PRODID_POSSIO_GCC ) { +/* request_region? oxsemi branch does no request_region too... */ +/* This sequence is needed to properly initialize MC45 attached to OXCF950. +* I tried decreasing these msleep()s, but it worked properly (survived +* 1000 stop/start operations) with these timeouts (or bigger). */ +outb (0xA , ctrl +1 ); +msleep (100 ); +outb (0xE , ctrl +1 ); +msleep (300 ); +outb (0xC , ctrl +1 ); +msleep (100 ); +outb (0xE , ctrl +1 ); +msleep (200 ); +outb (0xF , ctrl +1 ); +msleep (100 ); +outb (0xE , ctrl +1 ); +msleep (100 ); +outb (0xC , ctrl +1 ); + } +} +/*====================================================================== After a card is removed, serial_remove() will unregister
@@ -161,6 +191,7 @@ static int serial_resume(struct pcmcia_dfor (i =0 ; i < info->ndev; i++)serial8250_resume_port (info->line[i]); +wakeup_card (info); }return 0 ;
@@ -503,15 +534,23 @@ static int multi_config(struct pcmcia_de }/* The Oxford Semiconductor OXCF950 cards are in fact single-port: -8 registers are for the UART, the others are extra registers */ -if (info->manfid ==MANFID_OXSEMI ) { +* 8 registers are for the UART, the others are extra registers. +* Siemen's MC45 PCMCIA (Possio's GCC) is OXCF950 based too. +*/ +if (info->manfid ==MANFID_OXSEMI || (info->manfid ==MANFID_POSSIO && + info->prodid ==PRODID_POSSIO_GCC )) { +int err; +if (cf->index ==1 || cf->index ==3 ) { -setup_serial (link, info, base2, link->irq.AssignedIRQ); -outb (12 , link->io.BasePort1 +1 ); + err =setup_serial (link, info, base2, + link->irq.AssignedIRQ); + base2 = link->io.BasePort1; }else { -setup_serial (link, info, link->io.BasePort1, link->irq.AssignedIRQ); -outb (12 , base2 +1 ); + err =setup_serial (link, info, link->io.BasePort1, + link->irq.AssignedIRQ); } + info->c950ctrl = base2; +wakeup_card (info); rc =0 ; goto free_cfg_mem; }
@@ -583,6 +622,7 @@ static int serial_config(struct pcmcia_d tuple->DesiredTuple =CISTPL_MANFID ;if (first_tuple (link, tuple, parse) ==CS_SUCCESS ) { info->manfid = parse->manfid.manf; + info->prodid =le16_to_cpu (buf[1 ]);for (i =0 ; i <MULTI_COUNT ; i++)if ((info->manfid == multi_id[i].manfid) && (parse->manfid.card == multi_id[i].prodid))
include/pcmcia/ciscode.h +3 -0
@@ -122,4 +122,7 @@#define MANFID_XIRCOM 0x0105 +#define MANFID_POSSIO 0x030c +#define PRODID_POSSIO_GCC 0x0003 +#endif /* _LINUX_CISCODE_H */
Signature · 1 line
1.2.4