From 2927eda60977fde11a106cd9590cd710cd41884a Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 14 Sep 2012 17:34:05 +0100 Subject: [PATCH] staging: comedi: ni_65xx: move ni_65xx_driver Move the `struct comedi_driver ni_65xx_driver` variable further down the function to be closer to the `module_comedi_pci_driver()` module call and to avoid having to forward declare `ni_65xx_attach()` and `ni_65xx_detach()`. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_65xx.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index 529f4d5..6a5e84e 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c @@ -109,18 +109,7 @@ static inline unsigned Filter_Enable(unsigned port) #define OverflowIntEnable 0x02 #define EdgeIntEnable 0x01 -static int ni_65xx_attach(struct comedi_device *dev, - struct comedi_devconfig *it); -static void ni_65xx_detach(struct comedi_device *dev); -static struct comedi_driver ni_65xx_driver = { - .driver_name = "ni_65xx", - .module = THIS_MODULE, - .attach = ni_65xx_attach, - .detach = ni_65xx_detach, -}; - struct ni_65xx_board { - int dev_id; const char *name; unsigned num_dio_ports; @@ -822,6 +811,13 @@ static int ni_65xx_find_device(struct comedi_device *dev, int bus, int slot) return -EIO; } +static struct comedi_driver ni_65xx_driver = { + .driver_name = "ni_65xx", + .module = THIS_MODULE, + .attach = ni_65xx_attach, + .detach = ni_65xx_detach, +}; + static int __devinit ni_65xx_pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) { -- 2.7.4