Commit 80a55e92 authored by Andrew Morton's avatar Andrew Morton Committed by Dominik Brodowski
Browse files

[PATCH] pcmcia: remove unneeded forward declarations



Also remove a couple of unneeded typecasts.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent a0aab143
...@@ -298,9 +298,6 @@ static inline int pcmcia_load_firmware(struct pcmcia_device *dev, char * filenam ...@@ -298,9 +298,6 @@ static inline int pcmcia_load_firmware(struct pcmcia_device *dev, char * filenam
* *
* Registers a PCMCIA driver with the PCMCIA bus core. * Registers a PCMCIA driver with the PCMCIA bus core.
*/ */
static int pcmcia_device_probe(struct device *dev);
static int pcmcia_device_remove(struct device * dev);
int pcmcia_register_driver(struct pcmcia_driver *driver) int pcmcia_register_driver(struct pcmcia_driver *driver)
{ {
if (!driver) if (!driver)
...@@ -400,7 +397,7 @@ static int pcmcia_device_probe(struct device * dev) ...@@ -400,7 +397,7 @@ static int pcmcia_device_probe(struct device * dev)
* call which will then check whether there are two * call which will then check whether there are two
* pseudo devices, and if not, add the second one. * pseudo devices, and if not, add the second one.
*/ */
did = (struct pcmcia_device_id *) p_dev->dev.driver_data; did = p_dev->dev.driver_data;
if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
(p_dev->socket->device_count == 1) && (p_dev->device_no == 0)) (p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
pcmcia_add_pseudo_device(p_dev->socket); pcmcia_add_pseudo_device(p_dev->socket);
...@@ -448,7 +445,6 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le ...@@ -448,7 +445,6 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le
return; return;
} }
static int pcmcia_device_remove(struct device * dev) static int pcmcia_device_remove(struct device * dev)
{ {
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
...@@ -463,7 +459,7 @@ static int pcmcia_device_remove(struct device * dev) ...@@ -463,7 +459,7 @@ static int pcmcia_device_remove(struct device * dev)
* pseudo multi-function card, we need to unbind * pseudo multi-function card, we need to unbind
* all devices * all devices
*/ */
did = (struct pcmcia_device_id *) p_dev->dev.driver_data; did = p_dev->dev.driver_data;
if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
(p_dev->socket->device_count != 0) && (p_dev->socket->device_count != 0) &&
(p_dev->device_no == 0)) (p_dev->device_no == 0))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment