[PATCH 08/31] staging: comedi: ni_daq_700: refactor the pcmcia support code

[H Hartley Sweeten]

Refactor the pcmcia support code to remove the need for the
forward declarations.

Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Frank Mori Hess <fmhess@xxxxxxxxxxxxxxxxxxxxx>
Cc: Greg Kroah-hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 drivers/staging/comedi/drivers/ni_daq_700.c | 80 +++++++++++++----------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 1059297..f9b0d67 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -306,49 +306,11 @@ static void dio700_detach(struct comedi_device *dev)
 		free_irq(dev->irq, dev);
 };
 
-static void dio700_config(struct pcmcia_device *link);
-static void dio700_release(struct pcmcia_device *link);
-static int dio700_cs_suspend(struct pcmcia_device *p_dev);
-static int dio700_cs_resume(struct pcmcia_device *p_dev);
-
-static int dio700_cs_attach(struct pcmcia_device *);
-static void dio700_cs_detach(struct pcmcia_device *);
-
-struct local_info_t {
-	struct pcmcia_device *link;
-	int stop;
-	struct bus_operations *bus;
-};
-
-static int dio700_cs_attach(struct pcmcia_device *link)
-{
-	struct local_info_t *local;
-
-	printk(KERN_INFO "ni_daq_700:  cs-attach\n");
-
-	dev_dbg(&link->dev, "dio700_cs_attach()\n");
-
-	/* Allocate space for private device-specific data */
-	local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
-	if (!local)
-		return -ENOMEM;
-	local->link = link;
-	link->priv = local;
-
-	pcmcia_cur_dev = link;
-
-	dio700_config(link);
-
-	return 0;
-}
-
-static void dio700_cs_detach(struct pcmcia_device *link)
+static void dio700_release(struct pcmcia_device *link)
 {
-	((struct local_info_t *)link->priv)->stop = 1;
-	dio700_release(link);
+	dev_dbg(&link->dev, "dio700_release\n");
 
-	/* This points to the parent struct local_info_t struct */
-	kfree(link->priv);
+	pcmcia_disable_device(link);
 }
 
 static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev,
@@ -392,11 +354,41 @@ failed:
 
 }
 
-static void dio700_release(struct pcmcia_device *link)
+struct local_info_t {
+	struct pcmcia_device *link;
+	int stop;
+	struct bus_operations *bus;
+};
+
+static int dio700_cs_attach(struct pcmcia_device *link)
 {
-	dev_dbg(&link->dev, "dio700_release\n");
+	struct local_info_t *local;
 
-	pcmcia_disable_device(link);
+	printk(KERN_INFO "ni_daq_700:  cs-attach\n");
+
+	dev_dbg(&link->dev, "dio700_cs_attach()\n");
+
+	/* Allocate space for private device-specific data */
+	local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
+	if (!local)
+		return -ENOMEM;
+	local->link = link;
+	link->priv = local;
+
+	pcmcia_cur_dev = link;
+
+	dio700_config(link);
+
+	return 0;
+}
+
+static void dio700_cs_detach(struct pcmcia_device *link)
+{
+	((struct local_info_t *)link->priv)->stop = 1;
+	dio700_release(link);
+
+	/* This points to the parent struct local_info_t struct */
+	kfree(link->priv);
 }
 
 static int dio700_cs_suspend(struct pcmcia_device *link)
-- 
1.7.11

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/