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

staging: comedi: drivers: remove unnecessary *_SIZE defines 



Some of the legacy comedi drivers have a *_SIZE define that is only
passed to comedi_request_region() to specify the size of the region.

Some of the pnp drivers (pci, etc.) also have a *_SIZE define which
is unused.

For aesthetics, remove these defines.

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

drivers/staging/comedi/drivers/aio_iiro_16.c

+1 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ Configuration Options: 
#include <linux/module.h>

#include "../comedidev.h"



#define AIO_IIRO_16_SIZE	0x08

#define AIO_IIRO_16_RELAY_0_7	0x00

#define AIO_IIRO_16_INPUT_0_7	0x01

#define AIO_IIRO_16_IRQ		0x02
@@ -74,7 +73,7 @@ static int aio_iiro_16_attach(struct comedi_device *dev, 
	struct comedi_subdevice *s;

	int ret;



	ret = comedi_request_region(dev, it->options[0], AIO_IIRO_16_SIZE);

	ret = comedi_request_region(dev, it->options[0], 0x8);

	if (ret)

		return ret;

drivers/staging/comedi/drivers/amplc_pc236.c

+1 −4
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ unused. 


/* PC36AT / PCI236 registers */



#define PC236_IO_SIZE		4

#define PC236_LCR_IO_SIZE	128



/* Disable, and clear, interrupts */

#define PCI236_INTR_DISABLE	(PLX9052_INTCSR_LI1POL |	\

				 PLX9052_INTCSR_LI2POL |	\
@@ -448,7 +445,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it) 


	/* Process options according to bus type. */

	if (is_isa_board(thisboard)) {

		ret = comedi_request_region(dev, it->options[0], PC236_IO_SIZE);

		ret = comedi_request_region(dev, it->options[0], 0x4);

		if (ret)

			return ret;

drivers/staging/comedi/drivers/amplc_pc263.c

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ The state of the outputs can be read. 
#define PC263_DRIVER_NAME	"amplc_pc263"



/* PC263 registers */

#define PC263_IO_SIZE	2



/*

 * Board descriptions for Amplicon PC263.
@@ -75,7 +74,7 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	struct comedi_subdevice *s;

	int ret;



	ret = comedi_request_region(dev, it->options[0], PC263_IO_SIZE);

	ret = comedi_request_region(dev, it->options[0], 0x2);

	if (ret)

		return ret;

drivers/staging/comedi/drivers/amplc_pci224.c

+0 −2
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ Passing a zero for an option is the same as leaving it unspecified. 
/*

 * PCI224/234 i/o space 1 (PCIBAR2) registers.

 */

#define PCI224_IO1_SIZE	0x20	/* Size of i/o space 1 (8-bit registers) */

#define PCI224_Z2_CT0	0x14	/* 82C54 counter/timer 0 */

#define PCI224_Z2_CT1	0x15	/* 82C54 counter/timer 1 */

#define PCI224_Z2_CT2	0x16	/* 82C54 counter/timer 2 */
@@ -133,7 +132,6 @@ Passing a zero for an option is the same as leaving it unspecified. 
/*

 * PCI224/234 i/o space 2 (PCIBAR3) 16-bit registers.

 */

#define PCI224_IO2_SIZE	0x10	/* Size of i/o space 2 (16-bit registers). */

#define PCI224_DACDATA	0x00	/* (w-o) DAC FIFO data. */

#define PCI224_SOFTTRIG	0x00	/* (r-o) DAC software scan trigger. */

#define PCI224_DACCON	0x02	/* (r/w) DAC status/configuration. */

drivers/staging/comedi/drivers/amplc_pci230.c

+0 −3
Original line number Diff line number Diff line
@@ -200,9 +200,6 @@ for (or detection of) various hardware problems added by Ian Abbott. 
#define PCI_DEVICE_ID_PCI260 0x0006

#define PCI_DEVICE_ID_INVALID 0xffff



#define PCI230_IO1_SIZE 32	/* Size of I/O space 1 */

#define PCI230_IO2_SIZE 16	/* Size of I/O space 2 */



/* PCI230 i/o space 1 registers. */

#define PCI230_PPI_X_BASE	0x00	/* User PPI (82C55) base */

#define PCI230_PPI_X_A		0x00	/* User PPI (82C55) port A */