[patch 7/21] pcmcia: remove client_attributes
Dominik Brodowski
linux at dominikbrodowski.de
Fri Dec 17 05:07:10 EST 2004
Remove the "Attributes" entry of struct client_t -- _all_ in-kernel drivers
did set it to INFO_IO_CLIENT | INFO_CARD_SHARE anyway, and the pcmcia core
didn't care at all what this value was set to.
Also, remove the setting of the respective request field in all in-kernel
drivers -- the request structure is kept the same, though, to keep external
drivers compiling.
Signed-off-by: Dominik Brodowski <linux at brodo.de>
---
drivers/bluetooth/bluecard_cs.c | 1 -
drivers/bluetooth/bt3c_cs.c | 1 -
drivers/bluetooth/btuart_cs.c | 1 -
drivers/bluetooth/dtl1_cs.c | 1 -
drivers/char/pcmcia/synclink_cs.c | 1 -
drivers/ide/legacy/ide-cs.c | 1 -
drivers/isdn/hardware/avm/avm_cs.c | 1 -
drivers/isdn/hisax/avma1_cs.c | 1 -
drivers/isdn/hisax/elsa_cs.c | 1 -
drivers/isdn/hisax/sedlbauer_cs.c | 1 -
drivers/isdn/hisax/teles_cs.c | 1 -
drivers/mtd/maps/pcmciamtd.c | 1 -
drivers/net/pcmcia/3c574_cs.c | 1 -
drivers/net/pcmcia/3c589_cs.c | 1 -
drivers/net/pcmcia/axnet_cs.c | 1 -
drivers/net/pcmcia/com20020_cs.c | 1 -
drivers/net/pcmcia/fmvj18x_cs.c | 1 -
drivers/net/pcmcia/ibmtr_cs.c | 1 -
drivers/net/pcmcia/nmclan_cs.c | 1 -
drivers/net/pcmcia/pcnet_cs.c | 1 -
drivers/net/pcmcia/smc91c92_cs.c | 1 -
drivers/net/pcmcia/xirc2ps_cs.c | 1 -
drivers/net/wireless/airo_cs.c | 1 -
drivers/net/wireless/atmel_cs.c | 1 -
drivers/net/wireless/netwave_cs.c | 1 -
drivers/net/wireless/orinoco_cs.c | 1 -
drivers/net/wireless/ray_cs.c | 1 -
drivers/net/wireless/wavelan_cs.c | 1 -
drivers/net/wireless/wl3501_cs.c | 1 -
drivers/parport/parport_cs.c | 1 -
drivers/pcmcia/ds.c | 1 -
drivers/scsi/pcmcia/aha152x_stub.c | 1 -
drivers/scsi/pcmcia/fdomain_stub.c | 1 -
drivers/scsi/pcmcia/nsp_cs.c | 1 -
drivers/scsi/pcmcia/qlogic_stub.c | 1 -
drivers/scsi/pcmcia/sym53c500_cs.c | 1 -
drivers/serial/serial_cs.c | 1 -
drivers/telephony/ixj_pcmcia.c | 1 -
include/pcmcia/cs.h | 4 ++--
include/pcmcia/ds.h | 1 -
sound/pcmcia/pdaudiocf/pdaudiocf.c | 1 -
sound/pcmcia/vx/vx_entry.c | 1 -
42 files changed, 2 insertions(+), 43 deletions(-)
Index: 2.6.10-rc3/drivers/bluetooth/bluecard_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/bluetooth/bluecard_cs.c 2004-12-13 15:59:47.835598185 +0100
+++ 2.6.10-rc3/drivers/bluetooth/bluecard_cs.c 2004-12-13 16:04:26.380849520 +0100
@@ -904,7 +904,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/bluetooth/bt3c_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/bluetooth/bt3c_cs.c 2004-12-13 15:59:47.836598046 +0100
+++ 2.6.10-rc3/drivers/bluetooth/bt3c_cs.c 2004-12-13 16:04:26.381849380 +0100
@@ -709,7 +709,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/bluetooth/btuart_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/bluetooth/btuart_cs.c 2004-12-13 15:59:47.837597906 +0100
+++ 2.6.10-rc3/drivers/bluetooth/btuart_cs.c 2004-12-13 16:04:26.382849241 +0100
@@ -628,7 +628,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/bluetooth/dtl1_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/bluetooth/dtl1_cs.c 2004-12-13 15:59:47.838597767 +0100
+++ 2.6.10-rc3/drivers/bluetooth/dtl1_cs.c 2004-12-13 16:04:26.383849102 +0100
@@ -607,7 +607,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/char/pcmcia/synclink_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/char/pcmcia/synclink_cs.c 2004-12-13 15:59:47.855595401 +0100
+++ 2.6.10-rc3/drivers/char/pcmcia/synclink_cs.c 2004-12-13 16:04:26.400846736 +0100
@@ -608,7 +608,6 @@
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/ide/legacy/ide-cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/ide/legacy/ide-cs.c 2004-12-13 15:59:47.856595262 +0100
+++ 2.6.10-rc3/drivers/ide/legacy/ide-cs.c 2004-12-13 16:04:26.401846597 +0100
@@ -144,7 +144,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/isdn/hardware/avm/avm_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/isdn/hardware/avm/avm_cs.c 2004-12-13 15:59:47.857595123 +0100
+++ 2.6.10-rc3/drivers/isdn/hardware/avm/avm_cs.c 2004-12-13 16:04:26.402846458 +0100
@@ -178,7 +178,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/isdn/hisax/avma1_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/isdn/hisax/avma1_cs.c 2004-12-13 15:59:47.858594983 +0100
+++ 2.6.10-rc3/drivers/isdn/hisax/avma1_cs.c 2004-12-13 16:04:26.403846319 +0100
@@ -193,7 +193,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/isdn/hisax/elsa_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/isdn/hisax/elsa_cs.c 2004-12-13 15:59:47.859594844 +0100
+++ 2.6.10-rc3/drivers/isdn/hisax/elsa_cs.c 2004-12-13 16:04:26.404846179 +0100
@@ -227,7 +227,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/isdn/hisax/sedlbauer_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/isdn/hisax/sedlbauer_cs.c 2004-12-13 15:59:47.860594705 +0100
+++ 2.6.10-rc3/drivers/isdn/hisax/sedlbauer_cs.c 2004-12-13 16:04:26.405846040 +0100
@@ -240,7 +240,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/isdn/hisax/teles_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/isdn/hisax/teles_cs.c 2004-12-13 15:59:47.861594566 +0100
+++ 2.6.10-rc3/drivers/isdn/hisax/teles_cs.c 2004-12-13 16:04:26.405846040 +0100
@@ -208,7 +208,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/mtd/maps/pcmciamtd.c
===================================================================
--- 2.6.10-rc3.orig/drivers/mtd/maps/pcmciamtd.c 2004-12-13 15:59:47.862594427 +0100
+++ 2.6.10-rc3/drivers/mtd/maps/pcmciamtd.c 2004-12-13 16:04:26.408845623 +0100
@@ -800,7 +800,6 @@
/* Register with Card Services */
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
Index: 2.6.10-rc3/drivers/net/pcmcia/3c574_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/3c574_cs.c 2004-12-13 16:00:39.853357196 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/3c574_cs.c 2004-12-13 16:04:26.409845483 +0100
@@ -322,7 +322,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/pcmcia/3c589_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/3c589_cs.c 2004-12-13 16:00:39.854357057 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/3c589_cs.c 2004-12-13 16:04:26.411845205 +0100
@@ -236,7 +236,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/pcmcia/axnet_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/axnet_cs.c 2004-12-13 16:00:39.855356918 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/axnet_cs.c 2004-12-13 16:04:26.412845066 +0100
@@ -191,7 +191,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/pcmcia/com20020_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/com20020_cs.c 2004-12-13 16:00:39.856356779 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/com20020_cs.c 2004-12-13 16:04:26.413844927 +0100
@@ -211,7 +211,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/pcmcia/fmvj18x_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/fmvj18x_cs.c 2004-12-13 16:00:39.870354830 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/fmvj18x_cs.c 2004-12-13 16:04:26.414844788 +0100
@@ -299,7 +299,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/pcmcia/ibmtr_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/ibmtr_cs.c 2004-12-13 16:00:39.871354691 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/ibmtr_cs.c 2004-12-13 16:04:26.415844648 +0100
@@ -204,7 +204,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/pcmcia/nmclan_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/nmclan_cs.c 2004-12-13 16:00:39.873354413 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/nmclan_cs.c 2004-12-13 16:04:26.417844370 +0100
@@ -512,7 +512,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/pcmcia/pcnet_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/pcnet_cs.c 2004-12-13 16:00:39.874354273 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/pcnet_cs.c 2004-12-13 16:04:26.418844231 +0100
@@ -286,7 +286,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/pcmcia/smc91c92_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/smc91c92_cs.c 2004-12-13 16:00:39.876353995 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/smc91c92_cs.c 2004-12-13 16:04:26.420843953 +0100
@@ -374,7 +374,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask = CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
Index: 2.6.10-rc3/drivers/net/pcmcia/xirc2ps_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/pcmcia/xirc2ps_cs.c 2004-12-13 16:00:39.878353717 +0100
+++ 2.6.10-rc3/drivers/net/pcmcia/xirc2ps_cs.c 2004-12-13 16:04:26.422843674 +0100
@@ -627,7 +627,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/wireless/airo_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/wireless/airo_cs.c 2004-12-13 16:00:40.607252252 +0100
+++ 2.6.10-rc3/drivers/net/wireless/airo_cs.c 2004-12-13 16:04:26.423843535 +0100
@@ -225,7 +225,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/wireless/atmel_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/wireless/atmel_cs.c 2004-12-13 16:00:40.608252113 +0100
+++ 2.6.10-rc3/drivers/net/wireless/atmel_cs.c 2004-12-13 16:04:26.424843396 +0100
@@ -237,7 +237,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/wireless/netwave_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/wireless/netwave_cs.c 2004-12-13 16:00:40.609251974 +0100
+++ 2.6.10-rc3/drivers/net/wireless/netwave_cs.c 2004-12-13 16:04:26.425843257 +0100
@@ -503,7 +503,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/wireless/orinoco_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/wireless/orinoco_cs.c 2004-12-13 16:00:40.610251835 +0100
+++ 2.6.10-rc3/drivers/net/wireless/orinoco_cs.c 2004-12-13 16:04:26.426843117 +0100
@@ -197,7 +197,6 @@
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/wireless/ray_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/wireless/ray_cs.c 2004-12-13 16:00:40.612251557 +0100
+++ 2.6.10-rc3/drivers/net/wireless/ray_cs.c 2004-12-13 16:04:26.429842700 +0100
@@ -402,7 +402,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/net/wireless/wavelan_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/wireless/wavelan_cs.c 2004-12-13 16:00:40.616251000 +0100
+++ 2.6.10-rc3/drivers/net/wireless/wavelan_cs.c 2004-12-13 16:04:26.432842282 +0100
@@ -4686,7 +4686,6 @@
/* Register with Card Services */
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_REGISTRATION_COMPLETE |
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
Index: 2.6.10-rc3/drivers/net/wireless/wl3501_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/net/wireless/wl3501_cs.c 2004-12-13 16:00:40.618250721 +0100
+++ 2.6.10-rc3/drivers/net/wireless/wl3501_cs.c 2004-12-13 16:04:26.434842004 +0100
@@ -2015,7 +2015,6 @@
link->next = wl3501_dev_list;
wl3501_dev_list = link;
client_reg.dev_info = &wl3501_dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask = CS_EVENT_CARD_INSERTION |
CS_EVENT_RESET_PHYSICAL |
CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/parport/parport_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/parport/parport_cs.c 2004-12-13 15:59:47.885591226 +0100
+++ 2.6.10-rc3/drivers/parport/parport_cs.c 2004-12-13 16:04:26.435841865 +0100
@@ -143,7 +143,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/pcmcia/ds.c
===================================================================
--- 2.6.10-rc3.orig/drivers/pcmcia/ds.c 2004-12-13 16:04:23.388266075 +0100
+++ 2.6.10-rc3/drivers/pcmcia/ds.c 2004-12-13 16:04:26.436841726 +0100
@@ -709,7 +709,6 @@
*handle = client;
client->state &= ~CLIENT_UNBOUND;
client->Socket = s;
- client->Attributes = req->Attributes;
client->EventMask = req->EventMask;
client->event_handler = req->event_handler;
client->event_callback_args = req->event_callback_args;
Index: 2.6.10-rc3/drivers/scsi/pcmcia/aha152x_stub.c
===================================================================
--- 2.6.10-rc3.orig/drivers/scsi/pcmcia/aha152x_stub.c 2004-12-13 15:59:47.886591086 +0100
+++ 2.6.10-rc3/drivers/scsi/pcmcia/aha152x_stub.c 2004-12-13 16:04:26.437841587 +0100
@@ -145,7 +145,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.event_handler = &aha152x_event;
client_reg.EventMask =
CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/scsi/pcmcia/fdomain_stub.c
===================================================================
--- 2.6.10-rc3.orig/drivers/scsi/pcmcia/fdomain_stub.c 2004-12-13 15:59:47.887590947 +0100
+++ 2.6.10-rc3/drivers/scsi/pcmcia/fdomain_stub.c 2004-12-13 16:04:26.438841447 +0100
@@ -131,7 +131,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.event_handler = &fdomain_event;
client_reg.EventMask =
CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/scsi/pcmcia/nsp_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/scsi/pcmcia/nsp_cs.c 2004-12-13 15:59:47.889590669 +0100
+++ 2.6.10-rc3/drivers/scsi/pcmcia/nsp_cs.c 2004-12-13 16:04:26.440841169 +0100
@@ -1672,7 +1672,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/scsi/pcmcia/qlogic_stub.c
===================================================================
--- 2.6.10-rc3.orig/drivers/scsi/pcmcia/qlogic_stub.c 2004-12-13 15:59:47.890590530 +0100
+++ 2.6.10-rc3/drivers/scsi/pcmcia/qlogic_stub.c 2004-12-13 16:04:26.464837829 +0100
@@ -212,7 +212,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.event_handler = &qlogic_event;
client_reg.EventMask = CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
client_reg.Version = 0x0210;
Index: 2.6.10-rc3/drivers/scsi/pcmcia/sym53c500_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/scsi/pcmcia/sym53c500_cs.c 2004-12-13 15:41:12.000000000 +0100
+++ 2.6.10-rc3/drivers/scsi/pcmcia/sym53c500_cs.c 2004-12-13 16:04:26.465837690 +0100
@@ -995,7 +995,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.event_handler = &SYM53C500_event;
client_reg.EventMask = CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET |
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
Index: 2.6.10-rc3/drivers/serial/serial_cs.c
===================================================================
--- 2.6.10-rc3.orig/drivers/serial/serial_cs.c 2004-12-13 15:59:47.891590390 +0100
+++ 2.6.10-rc3/drivers/serial/serial_cs.c 2004-12-13 16:04:26.466837550 +0100
@@ -237,7 +237,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/drivers/telephony/ixj_pcmcia.c
===================================================================
--- 2.6.10-rc3.orig/drivers/telephony/ixj_pcmcia.c 2004-12-13 15:59:47.892590251 +0100
+++ 2.6.10-rc3/drivers/telephony/ixj_pcmcia.c 2004-12-13 16:04:26.481835463 +0100
@@ -69,7 +69,6 @@
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10-rc3/include/pcmcia/cs.h
===================================================================
--- 2.6.10-rc3.orig/include/pcmcia/cs.h 2004-12-13 16:04:22.625372267 +0100
+++ 2.6.10-rc3/include/pcmcia/cs.h 2004-12-13 16:04:26.482835324 +0100
@@ -124,7 +124,7 @@
/* For RegisterClient */
typedef struct client_reg_t {
dev_info_t *dev_info;
- u_int Attributes;
+ u_int Attributes; /* UNUSED */
u_int EventMask;
int (*event_handler)(event_t event, int priority,
event_callback_args_t *);
@@ -279,7 +279,7 @@
#define WIN_BAR_MASK 0xe000
#define WIN_BAR_SHIFT 13
-/* Attributes for RegisterClient */
+/* Attributes for RegisterClient -- UNUSED -- */
#define INFO_MASTER_CLIENT 0x01
#define INFO_IO_CLIENT 0x02
#define INFO_MTD_CLIENT 0x04
Index: 2.6.10-rc3/include/pcmcia/ds.h
===================================================================
--- 2.6.10-rc3.orig/include/pcmcia/ds.h 2004-12-13 16:04:23.388266075 +0100
+++ 2.6.10-rc3/include/pcmcia/ds.h 2004-12-13 16:04:26.482835324 +0100
@@ -163,7 +163,6 @@
struct pcmcia_socket *Socket;
u_char Function;
dev_info_t dev_info;
- u_int Attributes;
u_int state;
event_t EventMask;
int (*event_handler) (event_t event, int priority,
Index: 2.6.10-rc3/sound/pcmcia/pdaudiocf/pdaudiocf.c
===================================================================
--- 2.6.10-rc3.orig/sound/pcmcia/pdaudiocf/pdaudiocf.c 2004-12-13 15:59:47.893590112 +0100
+++ 2.6.10-rc3/sound/pcmcia/pdaudiocf/pdaudiocf.c 2004-12-13 16:04:26.483835184 +0100
@@ -183,7 +183,6 @@
/* Register with Card Services */
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL
#ifdef CONFIG_PM
Index: 2.6.10-rc3/sound/pcmcia/vx/vx_entry.c
===================================================================
--- 2.6.10-rc3.orig/sound/pcmcia/vx/vx_entry.c 2004-12-13 15:59:47.893590112 +0100
+++ 2.6.10-rc3/sound/pcmcia/vx/vx_entry.c 2004-12-13 16:04:26.484835045 +0100
@@ -162,7 +162,6 @@
/* Register with Card Services */
client_reg.dev_info = hw->dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL
#ifdef CONFIG_PM
More information about the linux-pcmcia
mailing list