]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] pcmcia: remove unneeded forward declarations
authorAndrew Morton <akpm@osdl.org>
Tue, 11 Apr 2006 06:24:57 +0000 (23:24 -0700)
committerDominik Brodowski <linux@dominikbrodowski.net>
Fri, 21 Apr 2006 22:49:16 +0000 (00:49 +0200)
Also remove a couple of unneeded typecasts.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
drivers/pcmcia/ds.c

index 0f98cab35186123868ccd62f24b37f08ab9ae657..48d3b3d30c2169231d6749f7478bab8a0d3b50b9 100644 (file)
@@ -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.
  */
-static int pcmcia_device_probe(struct device *dev);
-static int pcmcia_device_remove(struct device * dev);
-
 int pcmcia_register_driver(struct pcmcia_driver *driver)
 {
        if (!driver)
@@ -400,7 +397,7 @@ static int pcmcia_device_probe(struct device * dev)
         * call which will then check whether there are two
         * 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) &&
            (p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
                pcmcia_add_pseudo_device(p_dev->socket);
@@ -448,7 +445,6 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le
        return;
 }
 
-
 static int pcmcia_device_remove(struct device * dev)
 {
        struct pcmcia_device *p_dev;
@@ -463,7 +459,7 @@ static int pcmcia_device_remove(struct device * dev)
         * pseudo multi-function card, we need to unbind
         * 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) &&
            (p_dev->socket->device_count != 0) &&
            (p_dev->device_no == 0))