From 8ee019b9278efb271c1cbbb8fb7821ca240703b3 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:20:09 -0400 Subject: [PATCH] --- yaml --- r: 141650 b: refs/heads/master c: c1dd2fa6a12bfba92d3522fa43173480f52dbaed h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/skel.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7833b41d1750..e09d8e3cca21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca9ed0f295a5e85861c63713406d86643e570580 +refs/heads/master: c1dd2fa6a12bfba92d3522fa43173480f52dbaed diff --git a/trunk/drivers/staging/comedi/drivers/skel.c b/trunk/drivers/staging/comedi/drivers/skel.c index b8cdd6f8fc0e..9009d77146ed 100644 --- a/trunk/drivers/staging/comedi/drivers/skel.c +++ b/trunk/drivers/staging/comedi/drivers/skel.c @@ -88,13 +88,14 @@ Configuration Options: * boards in this way is optional, and completely driver-dependent. * Some drivers use arrays such as this, other do not. */ -typedef struct skel_board_struct { +struct skel_board { const char *name; int ai_chans; int ai_bits; int have_dio; -} skel_board; -static const skel_board skel_boards[] = { +}; + +static const struct skel_board skel_boards[] = { { name: "skel-100", ai_chans:16, @@ -125,7 +126,7 @@ MODULE_DEVICE_TABLE(pci, skel_pci_table); /* * Useful for shorthand access to the particular board structure */ -#define thisboard ((const skel_board *)dev->board_ptr) +#define thisboard ((const struct skel_board *)dev->board_ptr) /* this structure is for data unique to this hardware driver. If several hardware drivers keep similar information in this structure, @@ -177,8 +178,8 @@ static struct comedi_driver driver_skel = { * devices are such boards. */ board_name:&skel_boards[0].name, - offset:sizeof(skel_board), - num_names:sizeof(skel_boards) / sizeof(skel_board), + offset:sizeof(struct skel_board), + num_names:sizeof(skel_boards) / sizeof(struct skel_board), }; static int skel_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,