staging: comedi: pcmda12: remove boardinfo
authorH Hartley Sweeten <hartleys@visionengravers.com>
Mon, 8 Oct 2012 17:44:10 +0000 (10:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Oct 2012 18:51:30 +0000 (11:51 -0700)
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>
drivers/staging/comedi/drivers/pcmda12.c

index 28af8f6873ebcff10721a7391a6d02f9411a63bc..f2984f155061767d2a6942d88d9482d79e838d80 100644 (file)
@@ -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 = {
@@ -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;
@@ -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
@@ -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);