diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-02 10:25:26 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-22 20:02:05 -0400 |
commit | ef313e36d8896a42fc567a83a5d4b86821634e8d (patch) | |
tree | 0d2b4164686e5ff333978aa0f5dd5ade562e9796 /drivers/char/pcmcia | |
parent | ff08705860f3e92ea5233989b4a2384ebb421f26 (diff) |
pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() users
Remove the three remaining pcmcia_get_configuration_info() users:
- pcmciamtd is marked broken anyway.
- serial_cs.c can access the relevant structs directly
- ipwireless didn't use the output
CC: linux-serial@vger.kernel.org
CC: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/char/pcmcia')
-rw-r--r-- | drivers/char/pcmcia/ipwireless/main.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c index 5eca7a99afe6..1f520e544d45 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/char/pcmcia/ipwireless/main.c | |||
@@ -83,7 +83,6 @@ static int config_ipwireless(struct ipw_dev *ipw) | |||
83 | { | 83 | { |
84 | struct pcmcia_device *link = ipw->link; | 84 | struct pcmcia_device *link = ipw->link; |
85 | int ret; | 85 | int ret; |
86 | config_info_t conf; | ||
87 | tuple_t tuple; | 86 | tuple_t tuple; |
88 | unsigned short buf[64]; | 87 | unsigned short buf[64]; |
89 | cisparse_t parse; | 88 | cisparse_t parse; |
@@ -297,15 +296,6 @@ static int config_ipwireless(struct ipw_dev *ipw) | |||
297 | goto exit3; | 296 | goto exit3; |
298 | } | 297 | } |
299 | 298 | ||
300 | /* Look up current Vcc */ | ||
301 | |||
302 | ret = pcmcia_get_configuration_info(link, &conf); | ||
303 | |||
304 | if (ret != CS_SUCCESS) { | ||
305 | cs_error(link, GetConfigurationInfo, ret); | ||
306 | goto exit4; | ||
307 | } | ||
308 | |||
309 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n", | 299 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n", |
310 | ipw->is_v2_card ? "V2/V3" : "V1"); | 300 | ipw->is_v2_card ? "V2/V3" : "V1"); |
311 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME | 301 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME |