提交 f65d971d 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

staging: comedi: ni_labpc: rename labpc_board_struct

For aesthetic reasons, rename labpc_board_struct to labpc_boardinfo.
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 89f3e664
...@@ -420,7 +420,7 @@ static inline void labpc_writeb(unsigned int byte, unsigned long address) ...@@ -420,7 +420,7 @@ static inline void labpc_writeb(unsigned int byte, unsigned long address)
writeb(byte, (void __iomem *)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", .name = "lab-pc-1200",
.ai_speed = 10000, .ai_speed = 10000,
...@@ -482,7 +482,7 @@ static const struct labpc_board_struct labpc_boards[] = { ...@@ -482,7 +482,7 @@ static const struct labpc_board_struct labpc_boards[] = {
/* /*
* Useful for shorthand access to the particular board structure * 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 */ /* size in bytes of dma buffer */
static const int dma_buffer_size = 0xff00; static const int dma_buffer_size = 0xff00;
...@@ -681,14 +681,14 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, ...@@ -681,14 +681,14 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
} }
EXPORT_SYMBOL_GPL(labpc_common_attach); 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) labpc_pci_find_boardinfo(struct pci_dev *pcidev)
{ {
unsigned int device_id = pcidev->device; unsigned int device_id = pcidev->device;
unsigned int n; unsigned int n;
for (n = 0; n < ARRAY_SIZE(labpc_boards); 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 && if (board->bustype == pci_bustype &&
board->device_id == device_id) board->device_id == device_id)
return board; return board;
...@@ -2108,7 +2108,7 @@ static struct comedi_driver labpc_driver = { ...@@ -2108,7 +2108,7 @@ static struct comedi_driver labpc_driver = {
.detach = labpc_common_detach, .detach = labpc_common_detach,
.num_names = ARRAY_SIZE(labpc_boards), .num_names = ARRAY_SIZE(labpc_boards),
.board_name = &labpc_boards[0].name, .board_name = &labpc_boards[0].name,
.offset = sizeof(struct labpc_board_struct), .offset = sizeof(struct labpc_boardinfo),
}; };
#ifdef CONFIG_COMEDI_PCI_DRIVERS #ifdef CONFIG_COMEDI_PCI_DRIVERS
......
...@@ -33,7 +33,7 @@ enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer, ...@@ -33,7 +33,7 @@ enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer,
isa_dma_transfer isa_dma_transfer
}; };
struct labpc_board_struct { struct labpc_boardinfo {
const char *name; const char *name;
int device_id; /* device id for pci and pcmcia boards */ int device_id; /* device id for pci and pcmcia boards */
int ai_speed; /* maximum input speed in nanoseconds */ int ai_speed; /* maximum input speed in nanoseconds */
......
...@@ -73,7 +73,7 @@ NI manuals: ...@@ -73,7 +73,7 @@ NI manuals:
#include <pcmcia/cisreg.h> #include <pcmcia/cisreg.h>
#include <pcmcia/ds.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", .name = "daqcard-1200",
.device_id = 0x103, .device_id = 0x103,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册