Skip to content

Commit

Permalink
staging: comedi: pcmda12: remove boardinfo
Browse files Browse the repository at this point in the history
This driver only supports a single "boardtype". Remove the unneeded
boardinfo struct and its use in the driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 22, 2012
1 parent 1633912 commit 43fc365
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions drivers/staging/comedi/drivers/pcmda12.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,6 @@ Configuration Options:
#define MSB_PORT(chan) (LSB_PORT(chan)+1)
#define BITS 12

/*
* Bords
*/
struct pcmda12_board {
const char *name;
};

/* note these have no effect and are merely here for reference..
these are configured by jumpering the board! */
static const struct comedi_lrange pcmda12_ranges = {
Expand Down Expand Up @@ -162,7 +155,6 @@ static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
static int pcmda12_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
const struct pcmda12_board *board = comedi_board(dev);
struct comedi_subdevice *s;
unsigned long iobase;
int ret;
Expand All @@ -178,7 +170,7 @@ static int pcmda12_attach(struct comedi_device *dev,
}
dev->iobase = iobase;

dev->board_name = board->name;
dev->board_name = dev->driver->driver_name;

/*
* Allocate the private structure area. alloc_private() is a
Expand Down Expand Up @@ -218,20 +210,11 @@ static void pcmda12_detach(struct comedi_device *dev)
release_region(dev->iobase, IOSIZE);
}

static const struct pcmda12_board pcmda12_boards[] = {
{
.name = "pcmda12",
},
};

static struct comedi_driver pcmda12_driver = {
.driver_name = "pcmda12",
.module = THIS_MODULE,
.attach = pcmda12_attach,
.detach = pcmda12_detach,
.board_name = &pcmda12_boards[0].name,
.offset = sizeof(struct pcmda12_board),
.num_names = ARRAY_SIZE(pcmda12_boards),
};
module_comedi_driver(pcmda12_driver);

Expand Down

0 comments on commit 43fc365

Please sign in to comment.