From: Dominik Brodowski <linux@dominikbrodowski.de>
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@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/bluetooth/bluecard_cs.c | 1 -
25-akpm/drivers/bluetooth/bt3c_cs.c | 1 -
25-akpm/drivers/bluetooth/btuart_cs.c | 1 -
25-akpm/drivers/bluetooth/dtl1_cs.c | 1 -
25-akpm/drivers/char/pcmcia/synclink_cs.c | 1 -
25-akpm/drivers/ide/legacy/ide-cs.c | 1 -
25-akpm/drivers/isdn/hardware/avm/avm_cs.c | 1 -
25-akpm/drivers/isdn/hisax/avma1_cs.c | 1 -
25-akpm/drivers/isdn/hisax/elsa_cs.c | 1 -
25-akpm/drivers/isdn/hisax/sedlbauer_cs.c | 1 -
25-akpm/drivers/isdn/hisax/teles_cs.c | 1 -
25-akpm/drivers/mtd/maps/pcmciamtd.c | 1 -
25-akpm/drivers/net/pcmcia/3c574_cs.c | 1 -
25-akpm/drivers/net/pcmcia/3c589_cs.c | 1 -
25-akpm/drivers/net/pcmcia/axnet_cs.c | 1 -
25-akpm/drivers/net/pcmcia/com20020_cs.c | 1 -
25-akpm/drivers/net/pcmcia/fmvj18x_cs.c | 1 -
25-akpm/drivers/net/pcmcia/ibmtr_cs.c | 1 -
25-akpm/drivers/net/pcmcia/nmclan_cs.c | 1 -
25-akpm/drivers/net/pcmcia/pcnet_cs.c | 1 -
25-akpm/drivers/net/pcmcia/smc91c92_cs.c | 1 -
25-akpm/drivers/net/pcmcia/xirc2ps_cs.c | 1 -
25-akpm/drivers/net/wireless/airo_cs.c | 1 -
25-akpm/drivers/net/wireless/atmel_cs.c | 1 -
25-akpm/drivers/net/wireless/netwave_cs.c | 1 -
25-akpm/drivers/net/wireless/orinoco_cs.c | 1 -
25-akpm/drivers/net/wireless/ray_cs.c | 1 -
25-akpm/drivers/net/wireless/wavelan_cs.c | 1 -
25-akpm/drivers/net/wireless/wl3501_cs.c | 1 -
25-akpm/drivers/parport/parport_cs.c | 1 -
25-akpm/drivers/pcmcia/ds.c | 1 -
25-akpm/drivers/scsi/pcmcia/aha152x_stub.c | 1 -
25-akpm/drivers/scsi/pcmcia/fdomain_stub.c | 1 -
25-akpm/drivers/scsi/pcmcia/nsp_cs.c | 1 -
25-akpm/drivers/scsi/pcmcia/qlogic_stub.c | 1 -
25-akpm/drivers/scsi/pcmcia/sym53c500_cs.c | 1 -
25-akpm/drivers/serial/serial_cs.c | 1 -
25-akpm/drivers/telephony/ixj_pcmcia.c | 1 -
25-akpm/include/pcmcia/cs.h | 4 ++--
25-akpm/include/pcmcia/ds.h | 1 -
25-akpm/sound/pcmcia/pdaudiocf/pdaudiocf.c | 1 -
25-akpm/sound/pcmcia/vx/vx_entry.c | 1 -
42 files changed, 2 insertions(+), 43 deletions(-)
diff -puN drivers/bluetooth/bluecard_cs.c~pcmcia-remove-client_attributes drivers/bluetooth/bluecard_cs.c
--- 25/drivers/bluetooth/bluecard_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/bluetooth/bluecard_cs.c Fri Dec 17 15:25:00 2004
@@ -904,7 +904,6 @@ static dev_link_t *bluecard_attach(void)
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 |
diff -puN drivers/bluetooth/bt3c_cs.c~pcmcia-remove-client_attributes drivers/bluetooth/bt3c_cs.c
--- 25/drivers/bluetooth/bt3c_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/bluetooth/bt3c_cs.c Fri Dec 17 15:25:00 2004
@@ -709,7 +709,6 @@ static dev_link_t *bt3c_attach(void)
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 |
diff -puN drivers/bluetooth/btuart_cs.c~pcmcia-remove-client_attributes drivers/bluetooth/btuart_cs.c
--- 25/drivers/bluetooth/btuart_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/bluetooth/btuart_cs.c Fri Dec 17 15:25:00 2004
@@ -628,7 +628,6 @@ static dev_link_t *btuart_attach(void)
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 |
diff -puN drivers/bluetooth/dtl1_cs.c~pcmcia-remove-client_attributes drivers/bluetooth/dtl1_cs.c
--- 25/drivers/bluetooth/dtl1_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/bluetooth/dtl1_cs.c Fri Dec 17 15:25:00 2004
@@ -607,7 +607,6 @@ static dev_link_t *dtl1_attach(void)
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 |
diff -puN drivers/char/pcmcia/synclink_cs.c~pcmcia-remove-client_attributes drivers/char/pcmcia/synclink_cs.c
--- 25/drivers/char/pcmcia/synclink_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/char/pcmcia/synclink_cs.c Fri Dec 17 15:25:00 2004
@@ -608,7 +608,6 @@ static dev_link_t *mgslpc_attach(void)
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 |
diff -puN drivers/ide/legacy/ide-cs.c~pcmcia-remove-client_attributes drivers/ide/legacy/ide-cs.c
--- 25/drivers/ide/legacy/ide-cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/ide/legacy/ide-cs.c Fri Dec 17 15:25:00 2004
@@ -144,7 +144,6 @@ static dev_link_t *ide_attach(void)
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 |
diff -puN drivers/isdn/hardware/avm/avm_cs.c~pcmcia-remove-client_attributes drivers/isdn/hardware/avm/avm_cs.c
--- 25/drivers/isdn/hardware/avm/avm_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/isdn/hardware/avm/avm_cs.c Fri Dec 17 15:25:00 2004
@@ -178,7 +178,6 @@ static dev_link_t *avmcs_attach(void)
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 |
diff -puN drivers/isdn/hisax/avma1_cs.c~pcmcia-remove-client_attributes drivers/isdn/hisax/avma1_cs.c
--- 25/drivers/isdn/hisax/avma1_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/isdn/hisax/avma1_cs.c Fri Dec 17 15:25:00 2004
@@ -193,7 +193,6 @@ static dev_link_t *avma1cs_attach(void)
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 |
diff -puN drivers/isdn/hisax/elsa_cs.c~pcmcia-remove-client_attributes drivers/isdn/hisax/elsa_cs.c
--- 25/drivers/isdn/hisax/elsa_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/isdn/hisax/elsa_cs.c Fri Dec 17 15:25:00 2004
@@ -227,7 +227,6 @@ static dev_link_t *elsa_cs_attach(void)
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 |
diff -puN drivers/isdn/hisax/sedlbauer_cs.c~pcmcia-remove-client_attributes drivers/isdn/hisax/sedlbauer_cs.c
--- 25/drivers/isdn/hisax/sedlbauer_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/isdn/hisax/sedlbauer_cs.c Fri Dec 17 15:25:00 2004
@@ -240,7 +240,6 @@ static dev_link_t *sedlbauer_attach(void
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 |
diff -puN drivers/isdn/hisax/teles_cs.c~pcmcia-remove-client_attributes drivers/isdn/hisax/teles_cs.c
--- 25/drivers/isdn/hisax/teles_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/isdn/hisax/teles_cs.c Fri Dec 17 15:25:00 2004
@@ -208,7 +208,6 @@ static dev_link_t *teles_attach(void)
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 |
diff -puN drivers/mtd/maps/pcmciamtd.c~pcmcia-remove-client_attributes drivers/mtd/maps/pcmciamtd.c
--- 25/drivers/mtd/maps/pcmciamtd.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/mtd/maps/pcmciamtd.c Fri Dec 17 15:25:00 2004
@@ -800,7 +800,6 @@ static dev_link_t *pcmciamtd_attach(void
/* 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 |
diff -puN drivers/net/pcmcia/3c574_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/3c574_cs.c
--- 25/drivers/net/pcmcia/3c574_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/3c574_cs.c Fri Dec 17 15:25:00 2004
@@ -322,7 +322,6 @@ static dev_link_t *tc574_attach(void)
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 |
diff -puN drivers/net/pcmcia/3c589_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/3c589_cs.c
--- 25/drivers/net/pcmcia/3c589_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/3c589_cs.c Fri Dec 17 15:25:00 2004
@@ -236,7 +236,6 @@ static dev_link_t *tc589_attach(void)
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 |
diff -puN drivers/net/pcmcia/axnet_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/axnet_cs.c
--- 25/drivers/net/pcmcia/axnet_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/axnet_cs.c Fri Dec 17 15:25:00 2004
@@ -191,7 +191,6 @@ static dev_link_t *axnet_attach(void)
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 |
diff -puN drivers/net/pcmcia/com20020_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/com20020_cs.c
--- 25/drivers/net/pcmcia/com20020_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/com20020_cs.c Fri Dec 17 15:25:00 2004
@@ -211,7 +211,6 @@ static dev_link_t *com20020_attach(void)
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 |
diff -puN drivers/net/pcmcia/fmvj18x_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/fmvj18x_cs.c
--- 25/drivers/net/pcmcia/fmvj18x_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/fmvj18x_cs.c Fri Dec 17 15:25:00 2004
@@ -299,7 +299,6 @@ static dev_link_t *fmvj18x_attach(void)
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 |
diff -puN drivers/net/pcmcia/ibmtr_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/ibmtr_cs.c
--- 25/drivers/net/pcmcia/ibmtr_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/ibmtr_cs.c Fri Dec 17 15:25:00 2004
@@ -204,7 +204,6 @@ static dev_link_t *ibmtr_attach(void)
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 |
diff -puN drivers/net/pcmcia/nmclan_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/nmclan_cs.c
--- 25/drivers/net/pcmcia/nmclan_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/nmclan_cs.c Fri Dec 17 15:25:00 2004
@@ -512,7 +512,6 @@ static dev_link_t *nmclan_attach(void)
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 |
diff -puN drivers/net/pcmcia/pcnet_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/pcnet_cs.c
--- 25/drivers/net/pcmcia/pcnet_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/pcnet_cs.c Fri Dec 17 15:25:00 2004
@@ -286,7 +286,6 @@ static dev_link_t *pcnet_attach(void)
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 |
diff -puN drivers/net/pcmcia/smc91c92_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/smc91c92_cs.c
--- 25/drivers/net/pcmcia/smc91c92_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/smc91c92_cs.c Fri Dec 17 15:25:00 2004
@@ -374,7 +374,6 @@ static dev_link_t *smc91c92_attach(void)
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;
diff -puN drivers/net/pcmcia/xirc2ps_cs.c~pcmcia-remove-client_attributes drivers/net/pcmcia/xirc2ps_cs.c
--- 25/drivers/net/pcmcia/xirc2ps_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/pcmcia/xirc2ps_cs.c Fri Dec 17 15:25:00 2004
@@ -627,7 +627,6 @@ xirc2ps_attach(void)
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 |
diff -puN drivers/net/wireless/airo_cs.c~pcmcia-remove-client_attributes drivers/net/wireless/airo_cs.c
--- 25/drivers/net/wireless/airo_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/wireless/airo_cs.c Fri Dec 17 15:25:00 2004
@@ -225,7 +225,6 @@ static dev_link_t *airo_attach(void)
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 |
diff -puN drivers/net/wireless/atmel_cs.c~pcmcia-remove-client_attributes drivers/net/wireless/atmel_cs.c
--- 25/drivers/net/wireless/atmel_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/wireless/atmel_cs.c Fri Dec 17 15:25:00 2004
@@ -237,7 +237,6 @@ static dev_link_t *atmel_attach(void)
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 |
diff -puN drivers/net/wireless/netwave_cs.c~pcmcia-remove-client_attributes drivers/net/wireless/netwave_cs.c
--- 25/drivers/net/wireless/netwave_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/wireless/netwave_cs.c Fri Dec 17 15:25:00 2004
@@ -503,7 +503,6 @@ static dev_link_t *netwave_attach(void)
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 |
diff -puN drivers/net/wireless/orinoco_cs.c~pcmcia-remove-client_attributes drivers/net/wireless/orinoco_cs.c
--- 25/drivers/net/wireless/orinoco_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/wireless/orinoco_cs.c Fri Dec 17 15:25:00 2004
@@ -197,7 +197,6 @@ orinoco_cs_attach(void)
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 |
diff -puN drivers/net/wireless/ray_cs.c~pcmcia-remove-client_attributes drivers/net/wireless/ray_cs.c
--- 25/drivers/net/wireless/ray_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/wireless/ray_cs.c Fri Dec 17 15:25:00 2004
@@ -398,7 +398,6 @@ static dev_link_t *ray_attach(void)
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 |
diff -puN drivers/net/wireless/wavelan_cs.c~pcmcia-remove-client_attributes drivers/net/wireless/wavelan_cs.c
--- 25/drivers/net/wireless/wavelan_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/wireless/wavelan_cs.c Fri Dec 17 15:25:00 2004
@@ -4689,7 +4689,6 @@ wavelan_attach(void)
/* 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 |
diff -puN drivers/net/wireless/wl3501_cs.c~pcmcia-remove-client_attributes drivers/net/wireless/wl3501_cs.c
--- 25/drivers/net/wireless/wl3501_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/net/wireless/wl3501_cs.c Fri Dec 17 15:25:00 2004
@@ -2015,7 +2015,6 @@ static dev_link_t *wl3501_attach(void)
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 |
diff -puN drivers/parport/parport_cs.c~pcmcia-remove-client_attributes drivers/parport/parport_cs.c
--- 25/drivers/parport/parport_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/parport/parport_cs.c Fri Dec 17 15:25:00 2004
@@ -143,7 +143,6 @@ static dev_link_t *parport_attach(void)
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 |
diff -puN drivers/pcmcia/ds.c~pcmcia-remove-client_attributes drivers/pcmcia/ds.c
--- 25/drivers/pcmcia/ds.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/pcmcia/ds.c Fri Dec 17 15:25:00 2004
@@ -709,7 +709,6 @@ int pcmcia_register_client(client_handle
*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;
diff -puN drivers/scsi/pcmcia/aha152x_stub.c~pcmcia-remove-client_attributes drivers/scsi/pcmcia/aha152x_stub.c
--- 25/drivers/scsi/pcmcia/aha152x_stub.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/scsi/pcmcia/aha152x_stub.c Fri Dec 17 15:25:00 2004
@@ -145,7 +145,6 @@ static dev_link_t *aha152x_attach(void)
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 |
diff -puN drivers/scsi/pcmcia/fdomain_stub.c~pcmcia-remove-client_attributes drivers/scsi/pcmcia/fdomain_stub.c
--- 25/drivers/scsi/pcmcia/fdomain_stub.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/scsi/pcmcia/fdomain_stub.c Fri Dec 17 15:25:00 2004
@@ -131,7 +131,6 @@ static dev_link_t *fdomain_attach(void)
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 |
diff -puN drivers/scsi/pcmcia/nsp_cs.c~pcmcia-remove-client_attributes drivers/scsi/pcmcia/nsp_cs.c
--- 25/drivers/scsi/pcmcia/nsp_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/scsi/pcmcia/nsp_cs.c Fri Dec 17 15:25:00 2004
@@ -1672,7 +1672,6 @@ static dev_link_t *nsp_cs_attach(void)
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 |
diff -puN drivers/scsi/pcmcia/qlogic_stub.c~pcmcia-remove-client_attributes drivers/scsi/pcmcia/qlogic_stub.c
--- 25/drivers/scsi/pcmcia/qlogic_stub.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/scsi/pcmcia/qlogic_stub.c Fri Dec 17 15:25:00 2004
@@ -212,7 +212,6 @@ static dev_link_t *qlogic_attach(void)
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;
diff -puN drivers/scsi/pcmcia/sym53c500_cs.c~pcmcia-remove-client_attributes drivers/scsi/pcmcia/sym53c500_cs.c
--- 25/drivers/scsi/pcmcia/sym53c500_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/scsi/pcmcia/sym53c500_cs.c Fri Dec 17 15:25:00 2004
@@ -995,7 +995,6 @@ SYM53C500_attach(void)
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 |
diff -puN drivers/serial/serial_cs.c~pcmcia-remove-client_attributes drivers/serial/serial_cs.c
--- 25/drivers/serial/serial_cs.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/serial/serial_cs.c Fri Dec 17 15:25:00 2004
@@ -237,7 +237,6 @@ static dev_link_t *serial_attach(void)
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 |
diff -puN drivers/telephony/ixj_pcmcia.c~pcmcia-remove-client_attributes drivers/telephony/ixj_pcmcia.c
--- 25/drivers/telephony/ixj_pcmcia.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/drivers/telephony/ixj_pcmcia.c Fri Dec 17 15:25:00 2004
@@ -69,7 +69,6 @@ static dev_link_t *ixj_attach(void)
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 |
diff -puN include/pcmcia/cs.h~pcmcia-remove-client_attributes include/pcmcia/cs.h
--- 25/include/pcmcia/cs.h~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/include/pcmcia/cs.h Fri Dec 17 15:25:00 2004
@@ -124,7 +124,7 @@ typedef struct client_req_t {
/* 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 @@ typedef struct win_req_t {
#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
diff -puN include/pcmcia/ds.h~pcmcia-remove-client_attributes include/pcmcia/ds.h
--- 25/include/pcmcia/ds.h~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/include/pcmcia/ds.h Fri Dec 17 15:25:00 2004
@@ -163,7 +163,6 @@ struct pcmcia_device {
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,
diff -puN sound/pcmcia/pdaudiocf/pdaudiocf.c~pcmcia-remove-client_attributes sound/pcmcia/pdaudiocf/pdaudiocf.c
--- 25/sound/pcmcia/pdaudiocf/pdaudiocf.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/sound/pcmcia/pdaudiocf/pdaudiocf.c Fri Dec 17 15:25:00 2004
@@ -183,7 +183,6 @@ static dev_link_t *snd_pdacf_attach(void
/* 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
diff -puN sound/pcmcia/vx/vx_entry.c~pcmcia-remove-client_attributes sound/pcmcia/vx/vx_entry.c
--- 25/sound/pcmcia/vx/vx_entry.c~pcmcia-remove-client_attributes Fri Dec 17 15:25:00 2004
+++ 25-akpm/sound/pcmcia/vx/vx_entry.c Fri Dec 17 15:25:00 2004
@@ -162,7 +162,6 @@ dev_link_t *snd_vxpocket_attach(struct s
/* 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
_