diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-11-14 15:25:35 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-05 18:03:20 -0500 |
commit | b463581154f3f3eecda27cae60df813fefcd84d3 (patch) | |
tree | 5e5b0f7a32b0727b64e52b9b2649897e6c841074 /drivers/scsi/pcmcia/fdomain_stub.c | |
parent | f3990715589d378a2d3aa9b8accd78bb4a2378b7 (diff) |
[PATCH] pcmcia: remove dev_list from drivers
The linked list of devices managed by each PCMCIA driver is, in very most
cases, unused. Therefore, remove it from many drivers.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/scsi/pcmcia/fdomain_stub.c')
-rw-r--r-- | drivers/scsi/pcmcia/fdomain_stub.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c index 5842c938fff5..538fedb97924 100644 --- a/drivers/scsi/pcmcia/fdomain_stub.c +++ b/drivers/scsi/pcmcia/fdomain_stub.c | |||
@@ -87,8 +87,6 @@ static dev_link_t *fdomain_attach(void); | |||
87 | static void fdomain_detach(struct pcmcia_device *p_dev); | 87 | static void fdomain_detach(struct pcmcia_device *p_dev); |
88 | 88 | ||
89 | 89 | ||
90 | static dev_link_t *dev_list = NULL; | ||
91 | |||
92 | static dev_info_t dev_info = "fdomain_cs"; | 90 | static dev_info_t dev_info = "fdomain_cs"; |
93 | 91 | ||
94 | static dev_link_t *fdomain_attach(void) | 92 | static dev_link_t *fdomain_attach(void) |
@@ -116,8 +114,7 @@ static dev_link_t *fdomain_attach(void) | |||
116 | link->conf.Present = PRESENT_OPTION; | 114 | link->conf.Present = PRESENT_OPTION; |
117 | 115 | ||
118 | /* Register with Card Services */ | 116 | /* Register with Card Services */ |
119 | link->next = dev_list; | 117 | link->next = NULL; |
120 | dev_list = link; | ||
121 | client_reg.dev_info = &dev_info; | 118 | client_reg.dev_info = &dev_info; |
122 | client_reg.Version = 0x0210; | 119 | client_reg.Version = 0x0210; |
123 | client_reg.event_callback_args.client_data = link; | 120 | client_reg.event_callback_args.client_data = link; |
@@ -135,24 +132,14 @@ static dev_link_t *fdomain_attach(void) | |||
135 | 132 | ||
136 | static void fdomain_detach(struct pcmcia_device *p_dev) | 133 | static void fdomain_detach(struct pcmcia_device *p_dev) |
137 | { | 134 | { |
138 | dev_link_t *link = dev_to_instance(p_dev); | 135 | dev_link_t *link = dev_to_instance(p_dev); |
139 | dev_link_t **linkp; | ||
140 | 136 | ||
141 | DEBUG(0, "fdomain_detach(0x%p)\n", link); | 137 | DEBUG(0, "fdomain_detach(0x%p)\n", link); |
142 | 138 | ||
143 | /* Locate device structure */ | 139 | if (link->state & DEV_CONFIG) |
144 | for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) | 140 | fdomain_release(link); |
145 | if (*linkp == link) break; | 141 | |
146 | if (*linkp == NULL) | 142 | kfree(link->priv); |
147 | return; | ||
148 | |||
149 | if (link->state & DEV_CONFIG) | ||
150 | fdomain_release(link); | ||
151 | |||
152 | /* Unlink device structure, free bits */ | ||
153 | *linkp = link->next; | ||
154 | kfree(link->priv); | ||
155 | |||
156 | } /* fdomain_detach */ | 143 | } /* fdomain_detach */ |
157 | 144 | ||
158 | /*====================================================================*/ | 145 | /*====================================================================*/ |
@@ -324,7 +311,6 @@ static int __init init_fdomain_cs(void) | |||
324 | static void __exit exit_fdomain_cs(void) | 311 | static void __exit exit_fdomain_cs(void) |
325 | { | 312 | { |
326 | pcmcia_unregister_driver(&fdomain_cs_driver); | 313 | pcmcia_unregister_driver(&fdomain_cs_driver); |
327 | BUG_ON(dev_list != NULL); | ||
328 | } | 314 | } |
329 | 315 | ||
330 | module_init(init_fdomain_cs); | 316 | module_init(init_fdomain_cs); |