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

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

staging: comedi: pcmad: tidy up pcmad_attach() 



Remove the comment before the function, the options are documented at
the beginning of the file.

Remove the PCMAD_SIZE define. It's only used in the attach to specify
the io region size.

For aesthetic reasons, add some whitespace to the subdevice init and
reorder them a bit.

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 3275b4d3

drivers/staging/comedi/drivers/pcmad.c

+8 −17
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ 


#include <linux/ioport.h>



#define PCMAD_SIZE		4



#define PCMAD_STATUS		0

#define PCMAD_LSB		1

#define PCMAD_MSB		2
@@ -114,13 +112,6 @@ static int pcmad_ai_insn_read(struct comedi_device *dev, 
	return insn->n;

}



/*

 * options:

 * 0	i/o base

 * 1	unused

 * 2	0=single ended 1=differential

 * 3	0=straight binary 1=two's comp

 */

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

{

	const struct pcmad_board_struct *board = comedi_board(dev);
@@ -128,7 +119,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	struct comedi_subdevice *s;

	int ret;



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

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

	if (ret)

		return ret;
@@ -144,11 +135,11 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	s = &dev->subdevices[0];

	s->type		= COMEDI_SUBD_AI;

	s->subdev_flags	= SDF_READABLE | AREF_GROUND;

	s->n_chan = 16;		/* XXX */

	s->n_chan	= 16;

	s->len_chanlist	= 1;

	s->insn_read = pcmad_ai_insn_read;

	s->maxdata	= (1 << board->n_ai_bits) - 1;

	s->range_table	= &range_unknown;

	s->insn_read	= pcmad_ai_insn_read;



	return 0;

}