From 4ec690f555dd74ac09e593cc58b7e0373e327f31 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 24 Oct 2012 16:31:31 -0700
Subject: [PATCH] --- yaml --- r: 337259 b: refs/heads/master c:
 f9c62f3fe83d5c273afcb41051ce9de3e45fdb6e h: refs/heads/master i:   337257:
 afe6789def405adee761b864258c5925adcb705a   337255:
 0e44e8b2fb2a13d4a6385aa32f59c00f87b44d9b v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/cb_pcidda.c        | 26 +++++++------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 727155ee0bbf..25f394b6738d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 618351aed1dc9b0340bc755ffc0dba6caf190299
+refs/heads/master: f9c62f3fe83d5c273afcb41051ce9de3e45fdb6e
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidda.c b/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
index 8371fa2a1b7b..8918528e511e 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -120,15 +120,14 @@ Please report success/failure with other different cards to
 #define DADATA	8		/*  FIRST D/A DATA REGISTER (0) */
 
 static const struct comedi_lrange cb_pcidda_ranges = {
-	6,
-	{
-	 BIP_RANGE(10),
-	 BIP_RANGE(5),
-	 BIP_RANGE(2.5),
-	 UNI_RANGE(10),
-	 UNI_RANGE(5),
-	 UNI_RANGE(2.5),
-	 }
+	6, {
+		BIP_RANGE(10),
+		BIP_RANGE(5),
+		BIP_RANGE(2.5),
+		UNI_RANGE(10),
+		UNI_RANGE(5),
+		UNI_RANGE(2.5)
+	}
 };
 
 /*
@@ -149,7 +148,6 @@ struct cb_pcidda_board {
 	unsigned short device_id;
 	int ao_chans;
 	int ao_bits;
-	const struct comedi_lrange *ranges;
 };
 
 static const struct cb_pcidda_board cb_pcidda_boards[] = {
@@ -159,7 +157,6 @@ static const struct cb_pcidda_board cb_pcidda_boards[] = {
 	 .device_id = PCI_DEVICE_ID_DDA02_12,
 	 .ao_chans = 2,
 	 .ao_bits = 12,
-	 .ranges = &cb_pcidda_ranges,
 	 },
 	{
 	 .name = "pci-dda04/12",
@@ -167,7 +164,6 @@ static const struct cb_pcidda_board cb_pcidda_boards[] = {
 	 .device_id = PCI_DEVICE_ID_DDA04_12,
 	 .ao_chans = 4,
 	 .ao_bits = 12,
-	 .ranges = &cb_pcidda_ranges,
 	 },
 	{
 	 .name = "pci-dda08/12",
@@ -175,7 +171,6 @@ static const struct cb_pcidda_board cb_pcidda_boards[] = {
 	 .device_id = PCI_DEVICE_ID_DDA08_12,
 	 .ao_chans = 8,
 	 .ao_bits = 12,
-	 .ranges = &cb_pcidda_ranges,
 	 },
 	{
 	 .name = "pci-dda02/16",
@@ -183,7 +178,6 @@ static const struct cb_pcidda_board cb_pcidda_boards[] = {
 	 .device_id = PCI_DEVICE_ID_DDA02_16,
 	 .ao_chans = 2,
 	 .ao_bits = 16,
-	 .ranges = &cb_pcidda_ranges,
 	 },
 	{
 	 .name = "pci-dda04/16",
@@ -191,7 +185,6 @@ static const struct cb_pcidda_board cb_pcidda_boards[] = {
 	 .device_id = PCI_DEVICE_ID_DDA04_16,
 	 .ao_chans = 4,
 	 .ao_bits = 16,
-	 .ranges = &cb_pcidda_ranges,
 	 },
 	{
 	 .name = "pci-dda08/16",
@@ -199,7 +192,6 @@ static const struct cb_pcidda_board cb_pcidda_boards[] = {
 	 .device_id = PCI_DEVICE_ID_DDA08_16,
 	 .ao_chans = 8,
 	 .ao_bits = 16,
-	 .ranges = &cb_pcidda_ranges,
 	 },
 };
 
@@ -517,7 +509,7 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
 	s->subdev_flags = SDF_WRITABLE;
 	s->n_chan = thisboard->ao_chans;
 	s->maxdata = (1 << thisboard->ao_bits) - 1;
-	s->range_table = thisboard->ranges;
+	s->range_table = &cb_pcidda_ranges;
 	s->insn_write = cb_pcidda_ao_winsn;
 
 	/* two 8255 digital io subdevices */