From 6b50c68cb447a1960c6a5b1bfd7fa422926e9c19 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:15:29 -0400 Subject: [PATCH] --- yaml --- r: 141611 b: refs/heads/master c: 9beff277bb14a844b5cb437fcdca9db7534ee44a h: refs/heads/master i: 141609: f93103ed4df868b4331a9a58b936d31671771aee 141607: fe4a44c6baf618b43b5f127306cb1050e986020c v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ke_counter.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d5a203a0b077..3a81f7a9d2eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 217fbbbc74f136f35530cf9acb06d7231fbdc1f3 +refs/heads/master: 9beff277bb14a844b5cb437fcdca9db7534ee44a diff --git a/trunk/drivers/staging/comedi/drivers/ke_counter.c b/trunk/drivers/staging/comedi/drivers/ke_counter.c index 105a9cfeb745..6f538720d79f 100644 --- a/trunk/drivers/staging/comedi/drivers/ke_counter.c +++ b/trunk/drivers/staging/comedi/drivers/ke_counter.c @@ -61,14 +61,16 @@ MODULE_DEVICE_TABLE(pci, cnt_pci_table); /*-- board specification structure ------------------------------------------*/ -typedef struct { +struct cnt_board_struct { + const char *name; int device_id; int cnt_channel_nbr; int cnt_bits; -} cnt_board_struct; +}; + -static const cnt_board_struct cnt_boards[] = { +static const struct cnt_board_struct cnt_boards[] = { { name: CNT_DRIVER_NAME, device_id:CNT_CARD_DEVICE_ID, @@ -76,7 +78,7 @@ static const cnt_board_struct cnt_boards[] = { cnt_bits:24} }; -#define cnt_board_nbr (sizeof(cnt_boards)/sizeof(cnt_board_struct)) +#define cnt_board_nbr (sizeof(cnt_boards)/sizeof(struct cnt_board_struct)) /*-- device private structure -----------------------------------------------*/ @@ -148,7 +150,7 @@ static int cnt_attach(struct comedi_device * dev, struct comedi_devconfig * it) { struct comedi_subdevice *subdevice; struct pci_dev *pci_device; - cnt_board_struct *board; + struct cnt_board_struct *board; unsigned long io_base; int error, i; @@ -180,7 +182,7 @@ static int cnt_attach(struct comedi_device * dev, struct comedi_devconfig * it) } dev->board_ptr = cnt_boards + i; - board = (cnt_board_struct *) dev-> + board = (struct cnt_board_struct *) dev-> board_ptr; goto found; }