[PATCH 6/6 v3] staging: comedi: addi_apci_1564: remove use of devpriv->s_EeParameters
This driver no longer reads the eeprom to find the board specific data,
all the necessary data is in the boardinfo. Use the boardinfo directly
instead of passing through devpriv->s_EeParameters.
Signed-off-by: Chase Southwood
Cc: Ian Abbott
Cc: H Hartley Sweeten
---
2: Incorrect patch title fixed.
3: I apparently failed to redo this patch properly when I changed PATCH 4/6 and
it no longer applied. Just noticed this, and verified that the whole series
applies now.
drivers/staging/comedi/drivers/addi_apci_1564.c | 27 +
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c
b/drivers/staging/comedi/drivers/addi_apci_1564.c
index d5be8d3..b34ae34 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -65,22 +65,6 @@ static int apci1564_auto_attach(struct comedi_device *dev,
dev->iobase = pci_resource_start(pcidev, 1);
devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
- /* Initialize parameters that can be overridden in EEPROM */
- devpriv->s_EeParameters.i_NbrAiChannel = this_board->i_NbrAiChannel;
- devpriv->s_EeParameters.i_NbrAoChannel = this_board->i_NbrAoChannel;
- devpriv->s_EeParameters.i_AiMaxdata = this_board->i_AiMaxdata;
- devpriv->s_EeParameters.i_AoMaxdata = this_board->i_AoMaxdata;
- devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel;
- devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel;
- devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata;
- devpriv->s_EeParameters.i_Timer = this_board->i_Timer;
- devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =
- this_board->ui_MinAcquisitiontimeNs;
- devpriv->s_EeParameters.ui_MinDelaytimeNs =
- this_board->ui_MinDelaytimeNs;
-
- /* ## */
-
if (pcidev->irq > 0) {
ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
dev->board_name, dev);
@@ -114,14 +98,13 @@ static int apci1564_auto_attach(struct comedi_device *dev,
/* Allocate and Initialise DO Subdevice Structures */
s = >subdevices[3];
- if (devpriv->s_EeParameters.i_NbrDoChannel) {
+ if (this_board->i_NbrDoChannel) {
s->type = COMEDI_SUBD_DO;
s->subdev_flags =
SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
- s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel;
- s->maxdata = devpriv->s_EeParameters.i_DoMaxdata;
- s->len_chanlist =
- devpriv->s_EeParameters.i_NbrDoChannel;
+ s->n_chan = this_board->i_NbrDoChannel;
+ s->maxdata = this_board->i_DoMaxdata;
+ s->len_chanlist = this_board->i_NbrDoChannel;
s->range_table = _digital;
/* insn_config - for digital output memory */
@@ -135,7 +118,7 @@ static int apci1564_auto_attach(struct comedi_device *dev,
/* Allocate and Initialise Timer Subdevice Structures */
s = >subdevices[4];
- if (devpriv->s_EeParameters.i_Timer) {
+ if (this_board->i_Timer) {
s->type = COMEDI_SUBD_TIMER;
s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = 1;
--
1.9.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 6/6 v3] staging: comedi: addi_apci_1564: remove use of devpriv-s_EeParameters
This driver no longer reads the eeprom to find the board specific data,
all the necessary data is in the boardinfo. Use the boardinfo directly
instead of passing through devpriv-s_EeParameters.
Signed-off-by: Chase Southwood chase.southw...@gmail.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: H Hartley Sweeten hswee...@visionengravers.com
---
2: Incorrect patch title fixed.
3: I apparently failed to redo this patch properly when I changed PATCH 4/6 and
it no longer applied. Just noticed this, and verified that the whole series
applies now.
drivers/staging/comedi/drivers/addi_apci_1564.c | 27 +
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c
b/drivers/staging/comedi/drivers/addi_apci_1564.c
index d5be8d3..b34ae34 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -65,22 +65,6 @@ static int apci1564_auto_attach(struct comedi_device *dev,
dev-iobase = pci_resource_start(pcidev, 1);
devpriv-i_IobaseAmcc = pci_resource_start(pcidev, 0);
- /* Initialize parameters that can be overridden in EEPROM */
- devpriv-s_EeParameters.i_NbrAiChannel = this_board-i_NbrAiChannel;
- devpriv-s_EeParameters.i_NbrAoChannel = this_board-i_NbrAoChannel;
- devpriv-s_EeParameters.i_AiMaxdata = this_board-i_AiMaxdata;
- devpriv-s_EeParameters.i_AoMaxdata = this_board-i_AoMaxdata;
- devpriv-s_EeParameters.i_NbrDiChannel = this_board-i_NbrDiChannel;
- devpriv-s_EeParameters.i_NbrDoChannel = this_board-i_NbrDoChannel;
- devpriv-s_EeParameters.i_DoMaxdata = this_board-i_DoMaxdata;
- devpriv-s_EeParameters.i_Timer = this_board-i_Timer;
- devpriv-s_EeParameters.ui_MinAcquisitiontimeNs =
- this_board-ui_MinAcquisitiontimeNs;
- devpriv-s_EeParameters.ui_MinDelaytimeNs =
- this_board-ui_MinDelaytimeNs;
-
- /* ## */
-
if (pcidev-irq 0) {
ret = request_irq(pcidev-irq, v_ADDI_Interrupt, IRQF_SHARED,
dev-board_name, dev);
@@ -114,14 +98,13 @@ static int apci1564_auto_attach(struct comedi_device *dev,
/* Allocate and Initialise DO Subdevice Structures */
s = dev-subdevices[3];
- if (devpriv-s_EeParameters.i_NbrDoChannel) {
+ if (this_board-i_NbrDoChannel) {
s-type = COMEDI_SUBD_DO;
s-subdev_flags =
SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
- s-n_chan = devpriv-s_EeParameters.i_NbrDoChannel;
- s-maxdata = devpriv-s_EeParameters.i_DoMaxdata;
- s-len_chanlist =
- devpriv-s_EeParameters.i_NbrDoChannel;
+ s-n_chan = this_board-i_NbrDoChannel;
+ s-maxdata = this_board-i_DoMaxdata;
+ s-len_chanlist = this_board-i_NbrDoChannel;
s-range_table = range_digital;
/* insn_config - for digital output memory */
@@ -135,7 +118,7 @@ static int apci1564_auto_attach(struct comedi_device *dev,
/* Allocate and Initialise Timer Subdevice Structures */
s = dev-subdevices[4];
- if (devpriv-s_EeParameters.i_Timer) {
+ if (this_board-i_Timer) {
s-type = COMEDI_SUBD_TIMER;
s-subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s-n_chan = 1;
--
1.9.0
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
