aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <[email protected]>2013-09-30 17:53:11 -0700
committerGreg Kroah-Hartman <[email protected]>2013-10-03 14:04:49 -0700
commit83fa0099e76ddb7ba617489ca12b826d3bea1402 (patch)
treed6e021a6798ed882b01fa143f2fdcd22ffbee376
parent4d60c12d0c61fd36c1fbe54479d20f9c423f88b2 (diff)
staging: comedi: ni_at_ao: move the boardinfo declaration
For aesthetics, move the boardinfo declaration closer to the struct definition. Also, remove the cut-and-paste skel driver comment. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/comedi/drivers/ni_at_ao.c25
1 files changed, 10 insertions, 15 deletions
diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index 58c910e65905..0a8ed0c5785b 100644
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -98,16 +98,21 @@ Configuration options:
#define ATAO_2_RTSISHFT_RSI (1 << 0)
#define ATAO_2_RTSISTRB_REG 0x07
-/*
- * Board descriptions for two imaginary boards. Describing the
- * boards in this way is optional, and completely driver-dependent.
- * Some drivers use arrays such as this, other do not.
- */
struct atao_board {
const char *name;
int n_ao_chans;
};
+static const struct atao_board atao_boards[] = {
+ {
+ .name = "ai-ao-6",
+ .n_ao_chans = 6,
+ }, {
+ .name = "ai-ao-10",
+ .n_ao_chans = 10,
+ },
+};
+
struct atao_private {
unsigned short cfg1;
unsigned short cfg3;
@@ -384,16 +389,6 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return 0;
}
-static const struct atao_board atao_boards[] = {
- {
- .name = "ai-ao-6",
- .n_ao_chans = 6,
- }, {
- .name = "ai-ao-10",
- .n_ao_chans = 10,
- },
-};
-
static struct comedi_driver ni_at_ao_driver = {
.driver_name = "ni_at_ao",
.module = THIS_MODULE,