[RFC PATCH 5/8] pcmcia: remove unneeded forward declarations

Dominik Brodowski linux at dominikbrodowski.net
Tue Apr 18 13:20:24 EDT 2006


Please review these patches which I inted to push upstream for 2.6.17 soon.
Thanks,
	Dominik

From: Andrew Morton <akpm at osdl.org>
Subject: [PATCH] pcmcia: remove unneeded forward declarations

Also remove a couple of unneeded typecasts.

Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>

---

 drivers/pcmcia/ds.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

1d9e401bf875c9fc79001edea8b4caf83ab2f364
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 0f98cab..48d3b3d 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -298,9 +298,6 @@ static inline int pcmcia_load_firmware(s
  *
  * 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 de
 	 * 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 pc
 	return;
 }
 
-
 static int pcmcia_device_remove(struct device * dev)
 {
 	struct pcmcia_device *p_dev;
@@ -463,7 +459,7 @@ static int pcmcia_device_remove(struct d
 	 * 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))
-- 
1.2.6




More information about the linux-pcmcia mailing list