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

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

staging: comedi: ni_labpc: remove some unnecessary defines 



The EEPROM_SIZE and NUM_AO_CHAN defines are only used once and they
don't add any significant clarity to the driver. They are also pretty
generic symbol names. Remove them and just open code the values.

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 f91e45e2

drivers/staging/comedi/drivers/ni_labpc.h

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 
#ifndef _NI_LABPC_H

#define _NI_LABPC_H



#define EEPROM_SIZE	256	/*  256 byte eeprom */

#define NUM_AO_CHAN	2	/*  boards have two analog output channels */



enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer,

	isa_dma_transfer

};

drivers/staging/comedi/drivers/ni_labpc_common.c

+3 −3
Original line number Diff line number Diff line
@@ -1261,7 +1261,7 @@ int labpc_common_attach(struct comedi_device *dev, 
	if (board->has_ao) {

		s->type		= COMEDI_SUBD_AO;

		s->subdev_flags	= SDF_READABLE | SDF_WRITABLE | SDF_GROUND;

		s->n_chan	= NUM_AO_CHAN;

		s->n_chan	= 2;

		s->maxdata	= 0x0fff;

		s->range_table	= &range_labpc_ao;

		s->insn_write	= labpc_ao_insn_write;
@@ -1307,12 +1307,12 @@ int labpc_common_attach(struct comedi_device *dev, 
		s->type		= COMEDI_SUBD_UNUSED;

	}



	/* EEPROM */

	/* EEPROM (256 bytes) */

	s = &dev->subdevices[4];

	if (board->is_labpc1200) {

		s->type		= COMEDI_SUBD_MEMORY;

		s->subdev_flags	= SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;

		s->n_chan	= EEPROM_SIZE;

		s->n_chan	= 256;

		s->maxdata	= 0xff;

		s->insn_write	= labpc_eeprom_insn_write;