staging: comedi: ni_labpc: rename labpc_board_struct

For aesthetic reasons, rename labpc_board_struct to labpc_boardinfo.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 152dc844fa96bc5645f37d99648a5266884add71..590c8565ca7ba914493aedfde7d19a02180c1e24 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -420,7 +420,7 @@ static inline void labpc_writeb(unsigned int byte, unsigned long address)
        writeb(byte, (void __iomem *)address);
 }
 
-static const struct labpc_board_struct labpc_boards[] = {
+static const struct labpc_boardinfo labpc_boards[] = {
        {
         .name = "lab-pc-1200",
         .ai_speed = 10000,
@@ -482,7 +482,7 @@ static const struct labpc_board_struct labpc_boards[] = {
 /*
  * Useful for shorthand access to the particular board structure
  */
-#define thisboard ((struct labpc_board_struct *)dev->board_ptr)
+#define thisboard ((struct labpc_boardinfo *)dev->board_ptr)
 
 /* size in bytes of dma buffer */
 static const int dma_buffer_size = 0xff00;
@@ -681,14 +681,14 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
 }
 EXPORT_SYMBOL_GPL(labpc_common_attach);
 
-static const struct labpc_board_struct *
+static const struct labpc_boardinfo *
 labpc_pci_find_boardinfo(struct pci_dev *pcidev)
 {
        unsigned int device_id = pcidev->device;
        unsigned int n;
 
        for (n = 0; n < ARRAY_SIZE(labpc_boards); n++) {
-               const struct labpc_board_struct *board = &labpc_boards[n];
+               const struct labpc_boardinfo *board = &labpc_boards[n];
                if (board->bustype == pci_bustype &&
                    board->device_id == device_id)
                        return board;
@@ -2108,7 +2108,7 @@ static struct comedi_driver labpc_driver = {
        .detach = labpc_common_detach,
        .num_names = ARRAY_SIZE(labpc_boards),
        .board_name = &labpc_boards[0].name,
-       .offset = sizeof(struct labpc_board_struct),
+       .offset = sizeof(struct labpc_boardinfo),
 };
 
 #ifdef CONFIG_COMEDI_PCI_DRIVERS

diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h
index e052ed3ba544cc258a04fab5e1228e46b82e7546..6be3a11a6ade4c7b8aed72ce45daff5bb5b9261d 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.h
+++ b/drivers/staging/comedi/drivers/ni_labpc.h
@@ -33,7 +33,7 @@ enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer,
        isa_dma_transfer
 };
 
-struct labpc_board_struct {
+struct labpc_boardinfo {
        const char *name;
        int device_id;          /*  device id for pci and pcmcia boards */
        int ai_speed;           /*  maximum input speed in nanoseconds */

diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index be7d1413b2e513a5b4bf4f8af553eae9de117be2..5da87ee4fc46e2d052c23fa27c3595dcbc3f868e 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -73,7 +73,7 @@ NI manuals:
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
 
-static const struct labpc_board_struct labpc_cs_boards[] = {
+static const struct labpc_boardinfo labpc_cs_boards[] = {
        {
                .name                   = "daqcard-1200",
                .device_id              = 0x103,