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. A warning will be emitted if they aren't updated, though. Signed-off-by: Dominik Brodowski 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 | 4 +++- 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, 5 insertions(+), 43 deletions(-) diff -ruN linux-original/drivers/bluetooth/bluecard_cs.c linux/drivers/bluetooth/bluecard_cs.c --- linux-original/drivers/bluetooth/bluecard_cs.c 2004-11-06 16:26:08.467537240 +0100 +++ linux/drivers/bluetooth/bluecard_cs.c 2004-11-06 16:35:15.113434432 +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 | diff -ruN linux-original/drivers/bluetooth/bt3c_cs.c linux/drivers/bluetooth/bt3c_cs.c --- linux-original/drivers/bluetooth/bt3c_cs.c 2004-11-06 16:26:08.467537240 +0100 +++ linux/drivers/bluetooth/bt3c_cs.c 2004-11-06 16:35:15.114434280 +0100 @@ -712,7 +712,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 | diff -ruN linux-original/drivers/bluetooth/btuart_cs.c linux/drivers/bluetooth/btuart_cs.c --- linux-original/drivers/bluetooth/btuart_cs.c 2004-11-06 16:26:08.468537088 +0100 +++ linux/drivers/bluetooth/btuart_cs.c 2004-11-06 16:35:15.115434128 +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 | diff -ruN linux-original/drivers/bluetooth/dtl1_cs.c linux/drivers/bluetooth/dtl1_cs.c --- linux-original/drivers/bluetooth/dtl1_cs.c 2004-11-06 16:26:08.469536936 +0100 +++ linux/drivers/bluetooth/dtl1_cs.c 2004-11-06 16:35:15.117433824 +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 | diff -ruN linux-original/drivers/char/pcmcia/synclink_cs.c linux/drivers/char/pcmcia/synclink_cs.c --- linux-original/drivers/char/pcmcia/synclink_cs.c 2004-11-06 16:26:08.919468536 +0100 +++ linux/drivers/char/pcmcia/synclink_cs.c 2004-11-06 16:35:15.120433368 +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 | diff -ruN linux-original/drivers/ide/legacy/ide-cs.c linux/drivers/ide/legacy/ide-cs.c --- linux-original/drivers/ide/legacy/ide-cs.c 2004-11-06 16:26:09.654356816 +0100 +++ linux/drivers/ide/legacy/ide-cs.c 2004-11-06 16:35:15.121433216 +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 | diff -ruN linux-original/drivers/isdn/hardware/avm/avm_cs.c linux/drivers/isdn/hardware/avm/avm_cs.c --- linux-original/drivers/isdn/hardware/avm/avm_cs.c 2004-11-06 16:26:09.874323376 +0100 +++ linux/drivers/isdn/hardware/avm/avm_cs.c 2004-11-06 16:35:15.122433064 +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 | diff -ruN linux-original/drivers/isdn/hisax/avma1_cs.c linux/drivers/isdn/hisax/avma1_cs.c --- linux-original/drivers/isdn/hisax/avma1_cs.c 2004-11-06 16:26:09.889321096 +0100 +++ linux/drivers/isdn/hisax/avma1_cs.c 2004-11-06 16:35:15.131431696 +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 | diff -ruN linux-original/drivers/isdn/hisax/elsa_cs.c linux/drivers/isdn/hisax/elsa_cs.c --- linux-original/drivers/isdn/hisax/elsa_cs.c 2004-11-06 16:26:09.898319728 +0100 +++ linux/drivers/isdn/hisax/elsa_cs.c 2004-11-06 16:35:15.132431544 +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 | diff -ruN linux-original/drivers/isdn/hisax/sedlbauer_cs.c linux/drivers/isdn/hisax/sedlbauer_cs.c --- linux-original/drivers/isdn/hisax/sedlbauer_cs.c 2004-11-06 16:26:09.900319424 +0100 +++ linux/drivers/isdn/hisax/sedlbauer_cs.c 2004-11-06 16:35:15.133431392 +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 | diff -ruN linux-original/drivers/isdn/hisax/teles_cs.c linux/drivers/isdn/hisax/teles_cs.c --- linux-original/drivers/isdn/hisax/teles_cs.c 2004-11-06 16:26:09.903318968 +0100 +++ linux/drivers/isdn/hisax/teles_cs.c 2004-11-06 16:35:15.134431240 +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 | diff -ruN linux-original/drivers/mtd/maps/pcmciamtd.c linux/drivers/mtd/maps/pcmciamtd.c --- linux-original/drivers/mtd/maps/pcmciamtd.c 2004-11-06 16:26:10.287260600 +0100 +++ linux/drivers/mtd/maps/pcmciamtd.c 2004-11-06 16:35:15.135431088 +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 | diff -ruN linux-original/drivers/net/pcmcia/3c574_cs.c linux/drivers/net/pcmcia/3c574_cs.c --- linux-original/drivers/net/pcmcia/3c574_cs.c 2004-11-06 16:26:10.627208920 +0100 +++ linux/drivers/net/pcmcia/3c574_cs.c 2004-11-06 16:35:15.136430936 +0100 @@ -321,7 +321,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 | diff -ruN linux-original/drivers/net/pcmcia/3c589_cs.c linux/drivers/net/pcmcia/3c589_cs.c --- linux-original/drivers/net/pcmcia/3c589_cs.c 2004-11-06 16:26:10.628208768 +0100 +++ linux/drivers/net/pcmcia/3c589_cs.c 2004-11-06 16:35:15.137430784 +0100 @@ -233,7 +233,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 | diff -ruN linux-original/drivers/net/pcmcia/axnet_cs.c linux/drivers/net/pcmcia/axnet_cs.c --- linux-original/drivers/net/pcmcia/axnet_cs.c 2004-11-06 16:26:10.630208464 +0100 +++ linux/drivers/net/pcmcia/axnet_cs.c 2004-11-06 16:35:15.139430480 +0100 @@ -187,7 +187,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 | diff -ruN linux-original/drivers/net/pcmcia/com20020_cs.c linux/drivers/net/pcmcia/com20020_cs.c --- linux-original/drivers/net/pcmcia/com20020_cs.c 2004-11-06 16:26:10.635207704 +0100 +++ linux/drivers/net/pcmcia/com20020_cs.c 2004-11-06 16:35:15.140430328 +0100 @@ -202,7 +202,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 | diff -ruN linux-original/drivers/net/pcmcia/fmvj18x_cs.c linux/drivers/net/pcmcia/fmvj18x_cs.c --- linux-original/drivers/net/pcmcia/fmvj18x_cs.c 2004-11-06 16:26:10.646206032 +0100 +++ linux/drivers/net/pcmcia/fmvj18x_cs.c 2004-11-06 16:35:15.142430024 +0100 @@ -296,7 +296,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 | diff -ruN linux-original/drivers/net/pcmcia/ibmtr_cs.c linux/drivers/net/pcmcia/ibmtr_cs.c --- linux-original/drivers/net/pcmcia/ibmtr_cs.c 2004-11-06 16:26:10.648205728 +0100 +++ linux/drivers/net/pcmcia/ibmtr_cs.c 2004-11-06 16:35:15.143429872 +0100 @@ -200,7 +200,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 | diff -ruN linux-original/drivers/net/pcmcia/nmclan_cs.c linux/drivers/net/pcmcia/nmclan_cs.c --- linux-original/drivers/net/pcmcia/nmclan_cs.c 2004-11-06 16:26:10.659204056 +0100 +++ linux/drivers/net/pcmcia/nmclan_cs.c 2004-11-06 16:35:15.144429720 +0100 @@ -506,7 +506,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 | diff -ruN linux-original/drivers/net/pcmcia/pcnet_cs.c linux/drivers/net/pcmcia/pcnet_cs.c --- linux-original/drivers/net/pcmcia/pcnet_cs.c 2004-11-06 16:26:10.662203600 +0100 +++ linux/drivers/net/pcmcia/pcnet_cs.c 2004-11-06 16:35:15.146429416 +0100 @@ -301,7 +301,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 | diff -ruN linux-original/drivers/net/pcmcia/smc91c92_cs.c linux/drivers/net/pcmcia/smc91c92_cs.c --- linux-original/drivers/net/pcmcia/smc91c92_cs.c 2004-11-06 16:26:10.664203296 +0100 +++ linux/drivers/net/pcmcia/smc91c92_cs.c 2004-11-06 16:35:15.156427896 +0100 @@ -371,7 +371,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; diff -ruN linux-original/drivers/net/pcmcia/xirc2ps_cs.c linux/drivers/net/pcmcia/xirc2ps_cs.c --- linux-original/drivers/net/pcmcia/xirc2ps_cs.c 2004-11-06 16:26:10.667202840 +0100 +++ linux/drivers/net/pcmcia/xirc2ps_cs.c 2004-11-06 16:35:15.158427592 +0100 @@ -621,7 +621,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 | diff -ruN linux-original/drivers/net/wireless/airo_cs.c linux/drivers/net/wireless/airo_cs.c --- linux-original/drivers/net/wireless/airo_cs.c 2004-11-06 16:26:10.874171376 +0100 +++ linux/drivers/net/wireless/airo_cs.c 2004-11-06 16:35:15.159427440 +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 | diff -ruN linux-original/drivers/net/wireless/atmel_cs.c linux/drivers/net/wireless/atmel_cs.c --- linux-original/drivers/net/wireless/atmel_cs.c 2004-11-06 16:26:10.900167424 +0100 +++ linux/drivers/net/wireless/atmel_cs.c 2004-11-06 16:35:15.160427288 +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 | diff -ruN linux-original/drivers/net/wireless/netwave_cs.c linux/drivers/net/wireless/netwave_cs.c --- linux-original/drivers/net/wireless/netwave_cs.c 2004-11-06 16:26:10.904166816 +0100 +++ linux/drivers/net/wireless/netwave_cs.c 2004-11-06 16:35:15.162426984 +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 | diff -ruN linux-original/drivers/net/wireless/orinoco_cs.c linux/drivers/net/wireless/orinoco_cs.c --- linux-original/drivers/net/wireless/orinoco_cs.c 2004-11-06 16:26:10.912165600 +0100 +++ linux/drivers/net/wireless/orinoco_cs.c 2004-11-06 16:35:15.163426832 +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 | diff -ruN linux-original/drivers/net/wireless/ray_cs.c linux/drivers/net/wireless/ray_cs.c --- linux-original/drivers/net/wireless/ray_cs.c 2004-11-06 16:26:10.938161648 +0100 +++ linux/drivers/net/wireless/ray_cs.c 2004-11-06 16:35:15.166426376 +0100 @@ -398,7 +398,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 | diff -ruN linux-original/drivers/net/wireless/wavelan_cs.c linux/drivers/net/wireless/wavelan_cs.c --- linux-original/drivers/net/wireless/wavelan_cs.c 2004-11-06 16:26:10.941161192 +0100 +++ linux/drivers/net/wireless/wavelan_cs.c 2004-11-06 16:35:15.169425920 +0100 @@ -4689,7 +4689,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 | diff -ruN linux-original/drivers/net/wireless/wl3501_cs.c linux/drivers/net/wireless/wl3501_cs.c --- linux-original/drivers/net/wireless/wl3501_cs.c 2004-11-06 16:26:10.944160736 +0100 +++ linux/drivers/net/wireless/wl3501_cs.c 2004-11-06 16:35:15.180424248 +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 | diff -ruN linux-original/drivers/parport/parport_cs.c linux/drivers/parport/parport_cs.c --- linux-original/drivers/parport/parport_cs.c 2004-11-06 16:26:10.983154808 +0100 +++ linux/drivers/parport/parport_cs.c 2004-11-06 16:35:15.181424096 +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 | diff -ruN linux-original/drivers/pcmcia/ds.c linux/drivers/pcmcia/ds.c --- linux-original/drivers/pcmcia/ds.c 2004-11-06 16:34:49.152381112 +0100 +++ linux/drivers/pcmcia/ds.c 2004-11-06 16:39:04.138617312 +0100 @@ -658,6 +658,9 @@ struct pcmcia_bus_socket *skt = NULL; struct pcmcia_device *p_dev = NULL; +/* if (req->Attributes) no driver zeroing out req leads to false positives */ +// printk("Warning: %s still sets req->Attributes and needs to be fixed\n", (char *) req->dev_info); + /* Look for unbound client with matching dev_info */ down_read(&pcmcia_socket_list_rwsem); list_for_each_entry(s, &pcmcia_socket_list, socket_list) { @@ -700,7 +703,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; diff -ruN linux-original/drivers/scsi/pcmcia/aha152x_stub.c linux/drivers/scsi/pcmcia/aha152x_stub.c --- linux-original/drivers/scsi/pcmcia/aha152x_stub.c 2004-11-06 16:26:11.270111184 +0100 +++ linux/drivers/scsi/pcmcia/aha152x_stub.c 2004-11-06 16:35:15.184423640 +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 | diff -ruN linux-original/drivers/scsi/pcmcia/fdomain_stub.c linux/drivers/scsi/pcmcia/fdomain_stub.c --- linux-original/drivers/scsi/pcmcia/fdomain_stub.c 2004-11-06 16:26:11.271111032 +0100 +++ linux/drivers/scsi/pcmcia/fdomain_stub.c 2004-11-06 16:35:15.184423640 +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 | diff -ruN linux-original/drivers/scsi/pcmcia/nsp_cs.c linux/drivers/scsi/pcmcia/nsp_cs.c --- linux-original/drivers/scsi/pcmcia/nsp_cs.c 2004-11-06 16:26:11.285108904 +0100 +++ linux/drivers/scsi/pcmcia/nsp_cs.c 2004-11-06 16:35:15.186423336 +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 | diff -ruN linux-original/drivers/scsi/pcmcia/qlogic_stub.c linux/drivers/scsi/pcmcia/qlogic_stub.c --- linux-original/drivers/scsi/pcmcia/qlogic_stub.c 2004-11-06 16:26:11.286108752 +0100 +++ linux/drivers/scsi/pcmcia/qlogic_stub.c 2004-11-06 16:35:15.188423032 +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; diff -ruN linux-original/drivers/scsi/pcmcia/sym53c500_cs.c linux/drivers/scsi/pcmcia/sym53c500_cs.c --- linux-original/drivers/scsi/pcmcia/sym53c500_cs.c 2004-11-06 16:25:33.801807232 +0100 +++ linux/drivers/scsi/pcmcia/sym53c500_cs.c 2004-11-06 16:40:14.871864224 +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 | diff -ruN linux-original/drivers/serial/serial_cs.c linux/drivers/serial/serial_cs.c --- linux-original/drivers/serial/serial_cs.c 2004-11-06 16:26:11.463081848 +0100 +++ linux/drivers/serial/serial_cs.c 2004-11-06 16:35:15.189422880 +0100 @@ -268,7 +268,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 | diff -ruN linux-original/drivers/telephony/ixj_pcmcia.c linux/drivers/telephony/ixj_pcmcia.c --- linux-original/drivers/telephony/ixj_pcmcia.c 2004-11-06 16:26:11.496076832 +0100 +++ linux/drivers/telephony/ixj_pcmcia.c 2004-11-06 16:35:15.190422728 +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 | diff -ruN linux-original/include/pcmcia/cs.h linux/include/pcmcia/cs.h --- linux-original/include/pcmcia/cs.h 2004-11-06 16:33:09.472534752 +0100 +++ linux/include/pcmcia/cs.h 2004-11-06 16:35:15.190422728 +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 diff -ruN linux-original/include/pcmcia/ds.h linux/include/pcmcia/ds.h --- linux-original/include/pcmcia/ds.h 2004-11-06 16:34:49.152381112 +0100 +++ linux/include/pcmcia/ds.h 2004-11-06 16:36:27.844377648 +0100 @@ -158,7 +158,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, diff -ruN linux-original/sound/pcmcia/pdaudiocf/pdaudiocf.c linux/sound/pcmcia/pdaudiocf/pdaudiocf.c --- linux-original/sound/pcmcia/pdaudiocf/pdaudiocf.c 2004-11-06 16:26:19.240899440 +0100 +++ linux/sound/pcmcia/pdaudiocf/pdaudiocf.c 2004-11-06 16:35:15.192422424 +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 diff -ruN linux-original/sound/pcmcia/vx/vx_entry.c linux/sound/pcmcia/vx/vx_entry.c --- linux-original/sound/pcmcia/vx/vx_entry.c 2004-11-06 16:26:19.241899288 +0100 +++ linux/sound/pcmcia/vx/vx_entry.c 2004-11-06 16:35:15.201421056 +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