[PATCH 08/15] staging: comedi: ni_daq_dio24: move comedi_driver declaration

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Move the comedi_driver declaration down in the file. This removes
the need for the forward declarations.

For aesthetic reasons, add some whitespace to the declaration.

Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 drivers/staging/comedi/drivers/ni_daq_dio24.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 826bea9..acfef6e 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -56,9 +56,6 @@ static struct pcmcia_device *pcmcia_cur_dev;
 
 #define DIO24_SIZE 4		/*  size of io region used by board */
 
-static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it);
-static void dio24_detach(struct comedi_device *dev);
-
 enum dio24_bustype { pcmcia_bustype };
 
 struct dio24_board_struct {
@@ -96,16 +93,6 @@ struct dio24_private {
 	int data;		/* number of data points left to be taken */
 };
 
-static struct comedi_driver driver_dio24 = {
-	.driver_name = "ni_daq_dio24",
-	.module = THIS_MODULE,
-	.attach = dio24_attach,
-	.detach = dio24_detach,
-	.num_names = ARRAY_SIZE(dio24_boards),
-	.board_name = &dio24_boards[0].name,
-	.offset = sizeof(struct dio24_board_struct),
-};
-
 static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
 	struct dio24_private *devpriv;
@@ -184,6 +171,16 @@ static void dio24_detach(struct comedi_device *dev)
 		free_irq(dev->irq, dev);
 };
 
+static struct comedi_driver driver_dio24 = {
+	.driver_name	= "ni_daq_dio24",
+	.module		= THIS_MODULE,
+	.attach		= dio24_attach,
+	.detach		= dio24_detach,
+	.num_names	= ARRAY_SIZE(dio24_boards),
+	.board_name	= &dio24_boards[0].name,
+	.offset		= sizeof(struct dio24_board_struct),
+};
+
 static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
 				    void *priv_data)
 {
-- 
1.8.1.1.293.gfe73786

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel


[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux