Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6749ffa8 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_labpc_cs: move comedi_driver declaration 



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

For aesthetic reasons, add some whitespace to the declaration and
remove the unnecessary '&' before the function names. They are
already addresses.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b2e1be03

drivers/staging/comedi/drivers/ni_labpc_cs.c

+10 −12
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ NI manuals: 


static struct pcmcia_device *pcmcia_cur_dev;



static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it);



static const struct labpc_board_struct labpc_cs_boards[] = {

	{

	 .name = "daqcard-1200",
@@ -115,16 +113,6 @@ static const struct labpc_board_struct labpc_cs_boards[] = { 
 */

#define thisboard ((const struct labpc_board_struct *)dev->board_ptr)



static struct comedi_driver driver_labpc_cs = {

	.driver_name = "ni_labpc_cs",

	.module = THIS_MODULE,

	.attach = &labpc_attach,

	.detach = &labpc_common_detach,

	.num_names = ARRAY_SIZE(labpc_cs_boards),

	.board_name = &labpc_cs_boards[0].name,

	.offset = sizeof(struct labpc_board_struct),

};



static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)

{

	struct labpc_private *devpriv;
@@ -154,6 +142,16 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	return labpc_common_attach(dev, iobase, irq, 0);

}



static struct comedi_driver driver_labpc_cs = {

	.driver_name	= "ni_labpc_cs",

	.module		= THIS_MODULE,

	.attach		= labpc_attach,

	.detach		= labpc_common_detach,

	.num_names	= ARRAY_SIZE(labpc_cs_boards),

	.board_name	= &labpc_cs_boards[0].name,

	.offset		= sizeof(struct labpc_board_struct),

};



static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,

				void *priv_data)

{