* [PATCH 01/48] staging: comedi: addi_common: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 02/48] staging: comedi: addi_eeprom: " Ian Abbott
` (48 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/addi-data/addi_common.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 025b451..2e7fb21 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -44,7 +44,7 @@ static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
unsigned short w_Address = CR_CHAN(insn->chanspec);
unsigned short w_Data;
@@ -59,7 +59,7 @@ static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,
static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
{
struct comedi_device *dev = d;
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
this_board->interrupt(irq, d);
return IRQ_RETVAL(1);
@@ -67,7 +67,7 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
static int i_ADDI_Reset(struct comedi_device *dev)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
this_board->reset(dev);
return 0;
@@ -77,7 +77,7 @@ static int addi_auto_attach(struct comedi_device *dev,
unsigned long context_unused)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv;
struct comedi_subdevice *s;
int ret, n_subdevices;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 02/48] staging: comedi: addi_eeprom: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
2014-09-09 10:26 ` [PATCH 01/48] staging: comedi: addi_common: replace comedi_board() calls Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 03/48] staging: comedi: addi_apci_1516: " Ian Abbott
` (47 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/addi-data/addi_eeprom.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index aafc172..b731856 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
@@ -179,7 +179,7 @@ static void addi_eeprom_read_di_info(struct comedi_device *dev,
unsigned long iobase,
unsigned short addr)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short tmp;
@@ -200,7 +200,7 @@ static void addi_eeprom_read_do_info(struct comedi_device *dev,
unsigned long iobase,
unsigned short addr)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short tmp;
@@ -218,7 +218,7 @@ static void addi_eeprom_read_timer_info(struct comedi_device *dev,
{
struct addi_private *devpriv = dev->private;
#if 0
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
char *type = this_board->pc_EepromChip;
unsigned short offset = 0;
unsigned short ntimers;
@@ -259,7 +259,7 @@ static void addi_eeprom_read_ao_info(struct comedi_device *dev,
unsigned long iobase,
unsigned short addr)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short tmp;
@@ -278,7 +278,7 @@ static void addi_eeprom_read_ai_info(struct comedi_device *dev,
unsigned long iobase,
unsigned short addr)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short offset;
@@ -315,7 +315,7 @@ static void addi_eeprom_read_ai_info(struct comedi_device *dev,
static void addi_eeprom_read_info(struct comedi_device *dev,
unsigned long iobase)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
char *type = this_board->pc_EepromChip;
unsigned short size;
unsigned char nfuncs;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 03/48] staging: comedi: addi_apci_1516: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
2014-09-09 10:26 ` [PATCH 01/48] staging: comedi: addi_common: replace comedi_board() calls Ian Abbott
2014-09-09 10:26 ` [PATCH 02/48] staging: comedi: addi_eeprom: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 04/48] staging: comedi: addi_apci_3120: " Ian Abbott
` (46 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 5cd3968..55d00fd 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -102,7 +102,7 @@ static int apci1516_do_insn_bits(struct comedi_device *dev,
static int apci1516_reset(struct comedi_device *dev)
{
- const struct apci1516_boardinfo *this_board = comedi_board(dev);
+ const struct apci1516_boardinfo *this_board = dev->board_ptr;
struct apci1516_private *devpriv = dev->private;
if (!this_board->has_wdog)
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 04/48] staging: comedi: addi_apci_3120: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (2 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 03/48] staging: comedi: addi_apci_1516: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 05/48] staging: comedi: addi_apci_3xxx: " Ian Abbott
` (45 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 10 +++++-----
drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 87dff80..a83e2ae 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -253,7 +253,7 @@ static int apci3120_ai_insn_config(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
unsigned int i;
@@ -359,7 +359,7 @@ static int apci3120_ai_insn_read(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
unsigned short us_ConvertTiming, us_TmpValue, i;
unsigned char b_Tmp;
@@ -802,7 +802,7 @@ static int apci3120_cyclic_ai(int mode,
struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
unsigned char b_Tmp;
@@ -1728,7 +1728,7 @@ static int apci3120_config_insn_timer(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
unsigned int ui_Timervalue2;
unsigned short us_TmpValue;
@@ -1873,7 +1873,7 @@ static int apci3120_write_insn_timer(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
unsigned int ui_Timervalue2 = 0;
unsigned short us_TmpValue;
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 050c724..84501a3 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -44,7 +44,7 @@ static const struct addi_board apci3120_boardtypes[] = {
static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
{
struct comedi_device *dev = d;
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
this_board->interrupt(irq, d);
return IRQ_RETVAL(1);
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 05/48] staging: comedi: addi_apci_3xxx: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (3 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 04/48] staging: comedi: addi_apci_3120: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 06/48] staging: comedi: adl_pci9118: " Ian Abbott
` (44 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/addi_apci_3xxx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index f26e4ec..a296bd5 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -472,7 +472,7 @@ static int apci3xxx_ai_insn_read(struct comedi_device *dev,
static int apci3xxx_ai_ns_to_timer(struct comedi_device *dev,
unsigned int *ns, unsigned int flags)
{
- const struct apci3xxx_boardinfo *board = comedi_board(dev);
+ const struct apci3xxx_boardinfo *board = dev->board_ptr;
struct apci3xxx_private *devpriv = dev->private;
unsigned int base;
unsigned int timer;
@@ -523,7 +523,7 @@ static int apci3xxx_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct apci3xxx_boardinfo *board = comedi_board(dev);
+ const struct apci3xxx_boardinfo *board = dev->board_ptr;
int err = 0;
unsigned int arg;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 06/48] staging: comedi: adl_pci9118: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (4 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 05/48] staging: comedi: addi_apci_3xxx: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 07/48] staging: comedi: adv_pci1710: " Ian Abbott
` (43 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/adl_pci9118.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 41fa615..27d9a1d 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -1709,7 +1709,7 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
int master, int ext_mux, int softsshdelay,
int hw_err_mask)
{
- const struct pci9118_boardinfo *board = comedi_board(dev);
+ const struct pci9118_boardinfo *board = dev->board_ptr;
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct pci9118_private *devpriv;
struct comedi_subdevice *s;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 07/48] staging: comedi: adv_pci1710: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (5 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 06/48] staging: comedi: adl_pci9118: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 08/48] staging: comedi: adv_pci_dio: " Ian Abbott
` (42 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index b368962..5539bd2 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -327,7 +327,7 @@ static int pci171x_ai_dropout(struct comedi_device *dev,
unsigned int chan,
unsigned int val)
{
- const struct boardtype *board = comedi_board(dev);
+ const struct boardtype *board = dev->board_ptr;
struct pci1710_private *devpriv = dev->private;
if (board->cardtype != TYPE_PCI1713) {
@@ -413,7 +413,7 @@ static void setup_channel_list(struct comedi_device *dev,
unsigned int *chanlist, unsigned int n_chan,
unsigned int seglen)
{
- const struct boardtype *this_board = comedi_board(dev);
+ const struct boardtype *this_board = dev->board_ptr;
struct pci1710_private *devpriv = dev->private;
unsigned int i, range, chanprog;
@@ -715,7 +715,7 @@ static int pci1720_insn_write_ao(struct comedi_device *dev,
static int pci171x_ai_cancel(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct boardtype *this_board = comedi_board(dev);
+ const struct boardtype *this_board = dev->board_ptr;
struct pci1710_private *devpriv = dev->private;
switch (this_board->cardtype) {
@@ -828,7 +828,7 @@ static int move_block_from_fifo(struct comedi_device *dev,
static void pci1710_handle_fifo(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct boardtype *this_board = comedi_board(dev);
+ const struct boardtype *this_board = dev->board_ptr;
struct pci1710_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
int m, samplesinbuf;
@@ -968,7 +968,7 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct boardtype *this_board = comedi_board(dev);
+ const struct boardtype *this_board = dev->board_ptr;
struct pci1710_private *devpriv = dev->private;
int err = 0;
unsigned int arg;
@@ -1045,7 +1045,7 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
*/
static int pci171x_reset(struct comedi_device *dev)
{
- const struct boardtype *this_board = comedi_board(dev);
+ const struct boardtype *this_board = dev->board_ptr;
struct pci1710_private *devpriv = dev->private;
outw(0x30, dev->iobase + PCI171x_CNTCTRL);
@@ -1102,7 +1102,7 @@ static int pci1720_reset(struct comedi_device *dev)
*/
static int pci1710_reset(struct comedi_device *dev)
{
- const struct boardtype *this_board = comedi_board(dev);
+ const struct boardtype *this_board = dev->board_ptr;
switch (this_board->cardtype) {
case TYPE_PCI1720:
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 08/48] staging: comedi: adv_pci_dio: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (6 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 07/48] staging: comedi: adv_pci1710: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 09/48] staging: comedi: aio_aio12_8: " Ian Abbott
` (41 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/adv_pci_dio.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 99c8ba7..f2e2d7e 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -817,7 +817,7 @@ static int pci1760_reset(struct comedi_device *dev)
*/
static int pci_dio_reset(struct comedi_device *dev)
{
- const struct dio_boardtype *this_board = comedi_board(dev);
+ const struct dio_boardtype *this_board = dev->board_ptr;
switch (this_board->cardtype) {
case TYPE_PCI1730:
@@ -975,7 +975,7 @@ static int pci_dio_add_di(struct comedi_device *dev,
struct comedi_subdevice *s,
const struct diosubd_data *d)
{
- const struct dio_boardtype *this_board = comedi_board(dev);
+ const struct dio_boardtype *this_board = dev->board_ptr;
s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON | d->specflags;
@@ -1005,7 +1005,7 @@ static int pci_dio_add_do(struct comedi_device *dev,
struct comedi_subdevice *s,
const struct diosubd_data *d)
{
- const struct dio_boardtype *this_board = comedi_board(dev);
+ const struct dio_boardtype *this_board = dev->board_ptr;
s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 09/48] staging: comedi: aio_aio12_8: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (7 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 08/48] staging: comedi: adv_pci_dio: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 10/48] staging: comedi: amplc_dio200_common: " Ian Abbott
` (40 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/aio_aio12_8.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/aio_aio12_8.c b/drivers/staging/comedi/drivers/aio_aio12_8.c
index 61cdd25..538277a 100644
--- a/drivers/staging/comedi/drivers/aio_aio12_8.c
+++ b/drivers/staging/comedi/drivers/aio_aio12_8.c
@@ -178,7 +178,7 @@ static const struct comedi_lrange range_aio_aio12_8 = {
static int aio_aio12_8_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
- const struct aio12_8_boardtype *board = comedi_board(dev);
+ const struct aio12_8_boardtype *board = dev->board_ptr;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 10/48] staging: comedi: amplc_dio200_common: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (8 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 09/48] staging: comedi: aio_aio12_8: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 11/48] staging: comedi: amplc_pc236_common: " Ian Abbott
` (39 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
.../staging/comedi/drivers/amplc_dio200_common.c | 30 +++++++++++-----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_dio200_common.c b/drivers/staging/comedi/drivers/amplc_dio200_common.c
index 6cadf7e..aed03dc 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200_common.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200_common.c
@@ -127,7 +127,7 @@ struct dio200_subdev_intr {
static unsigned char dio200_read8(struct comedi_device *dev,
unsigned int offset)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
if (board->is_pcie)
offset <<= 3;
@@ -140,7 +140,7 @@ static unsigned char dio200_read8(struct comedi_device *dev,
static void dio200_write8(struct comedi_device *dev,
unsigned int offset, unsigned char val)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
if (board->is_pcie)
offset <<= 3;
@@ -154,7 +154,7 @@ static void dio200_write8(struct comedi_device *dev,
static unsigned int dio200_read32(struct comedi_device *dev,
unsigned int offset)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
if (board->is_pcie)
offset <<= 3;
@@ -167,7 +167,7 @@ static unsigned int dio200_read32(struct comedi_device *dev,
static void dio200_write32(struct comedi_device *dev,
unsigned int offset, unsigned int val)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
if (board->is_pcie)
offset <<= 3;
@@ -183,7 +183,7 @@ static int dio200_subdev_intr_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_intr *subpriv = s->private;
if (board->has_int_sce) {
@@ -200,7 +200,7 @@ static int dio200_subdev_intr_insn_bits(struct comedi_device *dev,
static void dio200_stop_intr(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_intr *subpriv = s->private;
subpriv->active = false;
@@ -212,7 +212,7 @@ static void dio200_stop_intr(struct comedi_device *dev,
static int dio200_start_intr(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_intr *subpriv = s->private;
struct comedi_cmd *cmd = &s->async->cmd;
unsigned int n;
@@ -306,7 +306,7 @@ static void dio200_read_scan_intr(struct comedi_device *dev,
static int dio200_handle_read_intr(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_intr *subpriv = s->private;
unsigned triggered;
unsigned intstat;
@@ -481,7 +481,7 @@ static int dio200_subdev_intr_init(struct comedi_device *dev,
unsigned int offset,
unsigned valid_isns)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_intr *subpriv;
subpriv = comedi_alloc_spriv(s, sizeof(*subpriv));
@@ -626,7 +626,7 @@ static int dio200_subdev_8254_set_gate_src(struct comedi_device *dev,
unsigned int counter_number,
unsigned int gate_src)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_8254 *subpriv = s->private;
unsigned char byte;
@@ -648,7 +648,7 @@ static int dio200_subdev_8254_get_gate_src(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned int counter_number)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_8254 *subpriv = s->private;
if (!board->has_clk_gat_sce)
@@ -664,7 +664,7 @@ static int dio200_subdev_8254_set_clock_src(struct comedi_device *dev,
unsigned int counter_number,
unsigned int clock_src)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_8254 *subpriv = s->private;
unsigned char byte;
@@ -687,7 +687,7 @@ static int dio200_subdev_8254_get_clock_src(struct comedi_device *dev,
unsigned int counter_number,
unsigned int *period_ns)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_8254 *subpriv = s->private;
unsigned clock_src;
@@ -760,7 +760,7 @@ static int dio200_subdev_8254_init(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned int offset)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct dio200_subdev_8254 *subpriv;
unsigned int chan;
@@ -981,7 +981,7 @@ EXPORT_SYMBOL_GPL(amplc_dio200_set_enhance);
int amplc_dio200_common_attach(struct comedi_device *dev, unsigned int irq,
unsigned long req_irq_flags)
{
- const struct dio200_board *board = comedi_board(dev);
+ const struct dio200_board *board = dev->board_ptr;
struct comedi_subdevice *s;
unsigned int n;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 11/48] staging: comedi: amplc_pc236_common: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (9 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 10/48] staging: comedi: amplc_dio200_common: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 12/48] staging: comedi: amplc_pci224: " Ian Abbott
` (38 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/amplc_pc236_common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pc236_common.c b/drivers/staging/comedi/drivers/amplc_pc236_common.c
index 2632a3b..963c5d8 100644
--- a/drivers/staging/comedi/drivers/amplc_pc236_common.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236_common.c
@@ -29,7 +29,7 @@
static void pc236_intr_update(struct comedi_device *dev, bool enable)
{
- const struct pc236_board *thisboard = comedi_board(dev);
+ const struct pc236_board *thisboard = dev->board_ptr;
struct pc236_private *devpriv = dev->private;
unsigned long flags;
@@ -49,7 +49,7 @@ static void pc236_intr_update(struct comedi_device *dev, bool enable)
*/
static bool pc236_intr_check(struct comedi_device *dev)
{
- const struct pc236_board *thisboard = comedi_board(dev);
+ const struct pc236_board *thisboard = dev->board_ptr;
struct pc236_private *devpriv = dev->private;
bool retval = false;
unsigned long flags;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 12/48] staging: comedi: amplc_pci224: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (10 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 11/48] staging: comedi: amplc_pc236_common: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 13/48] staging: comedi: amplc_pci230: " Ian Abbott
` (37 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/amplc_pci224.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index b65cd48..fa179d9 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -393,7 +393,7 @@ static void
pci224_ao_set_data(struct comedi_device *dev, int chan, int range,
unsigned int data)
{
- const struct pci224_board *thisboard = comedi_board(dev);
+ const struct pci224_board *thisboard = dev->board_ptr;
struct pci224_private *devpriv = dev->private;
unsigned short mangled;
@@ -645,7 +645,7 @@ static int pci224_ao_check_chanlist(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct pci224_board *thisboard = comedi_board(dev);
+ const struct pci224_board *thisboard = dev->board_ptr;
unsigned int range_check_0;
unsigned int chan_mask = 0;
int i;
@@ -859,7 +859,7 @@ static void pci224_ao_start_pacer(struct comedi_device *dev,
static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
- const struct pci224_board *thisboard = comedi_board(dev);
+ const struct pci224_board *thisboard = dev->board_ptr;
struct pci224_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
int range;
@@ -951,7 +951,7 @@ static void
pci224_ao_munge(struct comedi_device *dev, struct comedi_subdevice *s,
void *data, unsigned int num_bytes, unsigned int chan_index)
{
- const struct pci224_board *thisboard = comedi_board(dev);
+ const struct pci224_board *thisboard = dev->board_ptr;
struct comedi_cmd *cmd = &s->async->cmd;
unsigned short *array = data;
unsigned int length = num_bytes / sizeof(*array);
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 13/48] staging: comedi: amplc_pci230: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (11 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 12/48] staging: comedi: amplc_pci224: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 14/48] staging: comedi: cb_pcidas64: " Ian Abbott
` (36 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/amplc_pci230.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index eb75012..e9ca174 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -543,7 +543,7 @@ static const struct comedi_lrange pci230_ao_range = {
static unsigned short pci230_ai_read(struct comedi_device *dev)
{
- const struct pci230_board *thisboard = comedi_board(dev);
+ const struct pci230_board *thisboard = dev->board_ptr;
struct pci230_private *devpriv = dev->private;
unsigned short data;
@@ -565,7 +565,7 @@ static unsigned short pci230_ai_read(struct comedi_device *dev)
static unsigned short pci230_ao_mangle_datum(struct comedi_device *dev,
unsigned short datum)
{
- const struct pci230_board *thisboard = comedi_board(dev);
+ const struct pci230_board *thisboard = dev->board_ptr;
struct pci230_private *devpriv = dev->private;
/*
@@ -894,7 +894,7 @@ static int pci230_ao_check_chanlist(struct comedi_device *dev,
static int pci230_ao_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
- const struct pci230_board *thisboard = comedi_board(dev);
+ const struct pci230_board *thisboard = dev->board_ptr;
struct pci230_private *devpriv = dev->private;
int err = 0;
unsigned int tmp;
@@ -1556,7 +1556,7 @@ static int pci230_ai_check_chanlist(struct comedi_device *dev,
static int pci230_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
- const struct pci230_board *thisboard = comedi_board(dev);
+ const struct pci230_board *thisboard = dev->board_ptr;
struct pci230_private *devpriv = dev->private;
int err = 0;
unsigned int tmp;
@@ -2487,7 +2487,7 @@ static int pci230_auto_attach(struct comedi_device *dev,
"amplc_pci230: BUG! cannot determine board type!\n");
return -EINVAL;
}
- thisboard = comedi_board(dev);
+ thisboard = dev->board_ptr;
dev->board_name = thisboard->name;
rc = comedi_pci_enable(dev);
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 14/48] staging: comedi: cb_pcidas64: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (12 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 13/48] staging: comedi: amplc_pci230: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 15/48] staging: comedi: cb_pcidas: " Ian Abbott
` (35 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/cb_pcidas64.c | 66 ++++++++++++++--------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 56069d6..3b6bffc 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1038,7 +1038,7 @@ static const struct pcidas64_board pcidas64_boards[] = {
static inline unsigned short se_diff_bit_6xxx(struct comedi_device *dev,
int use_differential)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
if ((thisboard->layout == LAYOUT_64XX && !use_differential) ||
(thisboard->layout == LAYOUT_60XX && use_differential))
@@ -1121,7 +1121,7 @@ struct pcidas64_private {
static unsigned int ai_range_bits_6xxx(const struct comedi_device *dev,
unsigned int range_index)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
const struct comedi_krange *range =
&thisboard->ai_range_table->range[range_index];
unsigned int bits = 0;
@@ -1166,7 +1166,7 @@ static unsigned int ai_range_bits_6xxx(const struct comedi_device *dev,
static unsigned int hw_revision(const struct comedi_device *dev,
uint16_t hw_status_bits)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
if (thisboard->layout == LAYOUT_4020)
return (hw_status_bits >> 13) & 0x7;
@@ -1178,7 +1178,7 @@ static void set_dac_range_bits(struct comedi_device *dev,
uint16_t *bits, unsigned int channel,
unsigned int range)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
unsigned int code = thisboard->ao_range_code[range];
if (channel > 1)
@@ -1235,7 +1235,7 @@ static void disable_ai_interrupts(struct comedi_device *dev)
static void enable_ai_interrupts(struct comedi_device *dev,
const struct comedi_cmd *cmd)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
uint32_t bits;
unsigned long flags;
@@ -1259,7 +1259,7 @@ static void enable_ai_interrupts(struct comedi_device *dev,
/* initialize plx9080 chip */
static void init_plx9080(struct comedi_device *dev)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
uint32_t bits;
void __iomem *plx_iobase = devpriv->plx9080_iobase;
@@ -1337,7 +1337,7 @@ static void disable_ai_pacing(struct comedi_device *dev)
static int set_ai_fifo_segment_length(struct comedi_device *dev,
unsigned int num_entries)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
static const int increment_size = 0x100;
const struct hw_fifo_info *const fifo = thisboard->ai_fifo;
@@ -1366,7 +1366,7 @@ static int set_ai_fifo_segment_length(struct comedi_device *dev,
/* adjusts the size of hardware fifo (which determines block size for dma xfers) */
static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
unsigned int num_fifo_entries;
int retval;
const struct hw_fifo_info *const fifo = thisboard->ai_fifo;
@@ -1387,7 +1387,7 @@ static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples)
/* query length of fifo */
static unsigned int ai_fifo_size(struct comedi_device *dev)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
return devpriv->ai_fifo_segment_length *
@@ -1397,7 +1397,7 @@ static unsigned int ai_fifo_size(struct comedi_device *dev)
static void init_stc_registers(struct comedi_device *dev)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
uint16_t bits;
unsigned long flags;
@@ -1443,7 +1443,7 @@ static void init_stc_registers(struct comedi_device *dev)
static int alloc_and_init_dma_members(struct comedi_device *dev)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct pcidas64_private *devpriv = dev->private;
int i;
@@ -1526,7 +1526,7 @@ static int alloc_and_init_dma_members(struct comedi_device *dev)
static void cb_pcidas64_free_dma(struct comedi_device *dev)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct pcidas64_private *devpriv = dev->private;
int i;
@@ -1706,7 +1706,7 @@ static int cb_pcidas64_ai_eoc(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned long context)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
unsigned int status;
@@ -1725,7 +1725,7 @@ static int cb_pcidas64_ai_eoc(struct comedi_device *dev,
static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
unsigned int bits = 0, n;
unsigned int channel, range, aref;
@@ -1845,7 +1845,7 @@ static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
static int ai_config_calibration_source(struct comedi_device *dev,
unsigned int *data)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
unsigned int source = data[1];
int num_calibration_sources;
@@ -1867,7 +1867,7 @@ static int ai_config_calibration_source(struct comedi_device *dev,
static int ai_config_block_size(struct comedi_device *dev, unsigned int *data)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
int fifo_size;
const struct hw_fifo_info *const fifo = thisboard->ai_fifo;
unsigned int block_size, requested_block_size;
@@ -1921,7 +1921,7 @@ static int ai_config_master_clock_4020(struct comedi_device *dev,
/* XXX could add support for 60xx series */
static int ai_config_master_clock(struct comedi_device *dev, unsigned int *data)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
switch (thisboard->layout) {
case LAYOUT_4020:
@@ -1979,7 +1979,7 @@ static unsigned int get_divisor(unsigned int ns, unsigned int flags)
*/
static void check_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
unsigned int convert_divisor = 0, scan_divisor;
static const int min_convert_divisor = 3;
static const int max_convert_divisor =
@@ -2027,7 +2027,7 @@ static int cb_pcidas64_ai_check_chanlist(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct pcidas64_board *board = comedi_board(dev);
+ const struct pcidas64_board *board = dev->board_ptr;
unsigned int aref0 = CR_AREF(cmd->chanlist[0]);
int i;
@@ -2066,7 +2066,7 @@ static int cb_pcidas64_ai_check_chanlist(struct comedi_device *dev,
static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
int err = 0;
unsigned int tmp_arg, tmp_arg2;
unsigned int triggers;
@@ -2216,7 +2216,7 @@ static void setup_sample_counters(struct comedi_device *dev,
static inline unsigned int dma_transfer_size(struct comedi_device *dev)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
unsigned int num_samples;
@@ -2303,7 +2303,7 @@ static void select_master_clock_4020(struct comedi_device *dev,
static void select_master_clock(struct comedi_device *dev,
const struct comedi_cmd *cmd)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
switch (thisboard->layout) {
case LAYOUT_4020:
@@ -2335,7 +2335,7 @@ static inline void dma_start_sync(struct comedi_device *dev,
static void set_ai_pacing(struct comedi_device *dev, struct comedi_cmd *cmd)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
uint32_t convert_counter = 0, scan_counter = 0;
@@ -2384,7 +2384,7 @@ static int use_internal_queue_6xxx(const struct comedi_cmd *cmd)
static int setup_channel_queue(struct comedi_device *dev,
const struct comedi_cmd *cmd)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
unsigned short bits;
int i;
@@ -2521,7 +2521,7 @@ static inline void load_first_dma_descriptor(struct comedi_device *dev,
static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd;
@@ -2738,7 +2738,7 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)
/* empty fifo */
static void pio_drain_ai_fifo(struct comedi_device *dev)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
if (thisboard->layout == LAYOUT_4020)
pio_drain_ai_fifo_32(dev);
@@ -2748,7 +2748,7 @@ static void pio_drain_ai_fifo(struct comedi_device *dev)
static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
struct comedi_async *async = dev->read_subdev->async;
struct comedi_cmd *cmd = &async->cmd;
@@ -2793,7 +2793,7 @@ static void handle_ai_interrupt(struct comedi_device *dev,
unsigned short status,
unsigned int plx_status)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->read_subdev;
struct comedi_async *async = s->async;
@@ -3075,7 +3075,7 @@ static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec);
int range = CR_RANGE(insn->chanspec);
@@ -3227,7 +3227,7 @@ static inline int external_ai_queue_in_use(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
if (s->busy)
return 0;
@@ -3311,7 +3311,7 @@ static int cb_pcidas64_ao_check_chanlist(struct comedi_device *dev,
static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
int err = 0;
unsigned int tmp_arg;
@@ -3579,7 +3579,7 @@ static int caldac_i2c_write(struct comedi_device *dev,
static void caldac_write(struct comedi_device *dev, unsigned int channel,
unsigned int value)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
devpriv->caldac_state[channel] = value;
@@ -3765,7 +3765,7 @@ static int eeprom_read_insn(struct comedi_device *dev,
*/
static int setup_subdevices(struct comedi_device *dev)
{
- const struct pcidas64_board *thisboard = comedi_board(dev);
+ const struct pcidas64_board *thisboard = dev->board_ptr;
struct pcidas64_private *devpriv = dev->private;
struct comedi_subdevice *s;
int i;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 15/48] staging: comedi: cb_pcidas: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (13 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 14/48] staging: comedi: cb_pcidas64: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 16/48] staging: comedi: das08: " Ian Abbott
` (34 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/cb_pcidas.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index f5dd7dd..961903e 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -743,7 +743,7 @@ static int trimpot_8402_write(struct comedi_device *dev, unsigned int channel,
static int cb_pcidas_trimpot_write(struct comedi_device *dev,
unsigned int channel, unsigned int value)
{
- const struct cb_pcidas_board *thisboard = comedi_board(dev);
+ const struct cb_pcidas_board *thisboard = dev->board_ptr;
struct cb_pcidas_private *devpriv = dev->private;
if (devpriv->trimpot_value[channel] == value)
@@ -817,7 +817,7 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct cb_pcidas_board *thisboard = comedi_board(dev);
+ const struct cb_pcidas_board *thisboard = dev->board_ptr;
struct cb_pcidas_private *devpriv = dev->private;
int err = 0;
unsigned int arg;
@@ -939,7 +939,7 @@ static void cb_pcidas_ai_load_counters(struct comedi_device *dev)
static int cb_pcidas_ai_cmd(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct cb_pcidas_board *thisboard = comedi_board(dev);
+ const struct cb_pcidas_board *thisboard = dev->board_ptr;
struct cb_pcidas_private *devpriv = dev->private;
struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd;
@@ -1042,7 +1042,7 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct cb_pcidas_board *thisboard = comedi_board(dev);
+ const struct cb_pcidas_board *thisboard = dev->board_ptr;
struct cb_pcidas_private *devpriv = dev->private;
int err = 0;
unsigned int arg;
@@ -1134,7 +1134,7 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned int trig_num)
{
- const struct cb_pcidas_board *thisboard = comedi_board(dev);
+ const struct cb_pcidas_board *thisboard = dev->board_ptr;
struct cb_pcidas_private *devpriv = dev->private;
unsigned int num_bytes, num_points = thisboard->fifo_size;
struct comedi_async *async = s->async;
@@ -1266,7 +1266,7 @@ static int cb_pcidas_ao_cancel(struct comedi_device *dev,
static void handle_ao_interrupt(struct comedi_device *dev, unsigned int status)
{
- const struct cb_pcidas_board *thisboard = comedi_board(dev);
+ const struct cb_pcidas_board *thisboard = dev->board_ptr;
struct cb_pcidas_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->write_subdev;
struct comedi_async *async = s->async;
@@ -1321,7 +1321,7 @@ static void handle_ao_interrupt(struct comedi_device *dev, unsigned int status)
static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
{
struct comedi_device *dev = (struct comedi_device *)d;
- const struct cb_pcidas_board *thisboard = comedi_board(dev);
+ const struct cb_pcidas_board *thisboard = dev->board_ptr;
struct cb_pcidas_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->read_subdev;
struct comedi_async *async;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 16/48] staging: comedi: das08: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (14 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 15/48] staging: comedi: cb_pcidas: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 17/48] staging: comedi: das08_isa: " Ian Abbott
` (33 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/das08.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index f761a5a..bdb671a 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -217,7 +217,7 @@ static int das08_ai_eoc(struct comedi_device *dev,
static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- const struct das08_board_struct *thisboard = comedi_board(dev);
+ const struct das08_board_struct *thisboard = dev->board_ptr;
struct das08_private_struct *devpriv = dev->private;
int n;
int chan;
@@ -337,7 +337,7 @@ static int das08jr_do_wbits(struct comedi_device *dev,
static void das08_ao_set_data(struct comedi_device *dev,
unsigned int chan, unsigned int data)
{
- const struct das08_board_struct *thisboard = comedi_board(dev);
+ const struct das08_board_struct *thisboard = dev->board_ptr;
unsigned char lsb;
unsigned char msb;
@@ -376,7 +376,7 @@ static int das08_ao_insn_write(struct comedi_device *dev,
static void i8254_initialize(struct comedi_device *dev)
{
- const struct das08_board_struct *thisboard = comedi_board(dev);
+ const struct das08_board_struct *thisboard = dev->board_ptr;
unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset;
unsigned int mode = I8254_MODE0 | I8254_BINARY;
int i;
@@ -389,7 +389,7 @@ static int das08_counter_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- const struct das08_board_struct *thisboard = comedi_board(dev);
+ const struct das08_board_struct *thisboard = dev->board_ptr;
unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset;
int chan = insn->chanspec;
@@ -401,7 +401,7 @@ static int das08_counter_write(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- const struct das08_board_struct *thisboard = comedi_board(dev);
+ const struct das08_board_struct *thisboard = dev->board_ptr;
unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset;
int chan = insn->chanspec;
@@ -413,7 +413,7 @@ static int das08_counter_config(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- const struct das08_board_struct *thisboard = comedi_board(dev);
+ const struct das08_board_struct *thisboard = dev->board_ptr;
unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset;
int chan = insn->chanspec;
@@ -432,7 +432,7 @@ static int das08_counter_config(struct comedi_device *dev,
int das08_common_attach(struct comedi_device *dev, unsigned long iobase)
{
- const struct das08_board_struct *thisboard = comedi_board(dev);
+ const struct das08_board_struct *thisboard = dev->board_ptr;
struct das08_private_struct *devpriv = dev->private;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 17/48] staging: comedi: das08_isa: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (15 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 16/48] staging: comedi: das08: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 18/48] staging: comedi: das16: " Ian Abbott
` (32 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/das08_isa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/das08_isa.c b/drivers/staging/comedi/drivers/das08_isa.c
index 4fb03d3..e4ba268 100644
--- a/drivers/staging/comedi/drivers/das08_isa.c
+++ b/drivers/staging/comedi/drivers/das08_isa.c
@@ -174,7 +174,7 @@ static const struct das08_board_struct das08_isa_boards[] = {
static int das08_isa_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
- const struct das08_board_struct *thisboard = comedi_board(dev);
+ const struct das08_board_struct *thisboard = dev->board_ptr;
struct das08_private_struct *devpriv;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 18/48] staging: comedi: das16: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (16 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 17/48] staging: comedi: das08_isa: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 19/48] staging: comedi: das1800: " Ian Abbott
` (31 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/das16.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index aa52a5b..baec9f2 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -631,7 +631,7 @@ static int das16_ai_check_chanlist(struct comedi_device *dev,
static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct das16_board *board = comedi_board(dev);
+ const struct das16_board *board = dev->board_ptr;
struct das16_private_struct *devpriv = dev->private;
int err = 0;
unsigned int trig_mask;
@@ -748,7 +748,7 @@ static unsigned int das16_set_pacer(struct comedi_device *dev, unsigned int ns,
static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s)
{
- const struct das16_board *board = comedi_board(dev);
+ const struct das16_board *board = dev->board_ptr;
struct das16_private_struct *devpriv = dev->private;
struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd;
@@ -883,7 +883,7 @@ static int das16_ai_insn_read(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct das16_board *board = comedi_board(dev);
+ const struct das16_board *board = dev->board_ptr;
unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int range = CR_RANGE(insn->chanspec);
unsigned int val;
@@ -968,7 +968,7 @@ static int das16_do_insn_bits(struct comedi_device *dev,
static int das16_probe(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct das16_board *board = comedi_board(dev);
+ const struct das16_board *board = dev->board_ptr;
int diobits;
/* diobits indicates boards */
@@ -993,7 +993,7 @@ static void das16_reset(struct comedi_device *dev)
static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct das16_board *board = comedi_board(dev);
+ const struct das16_board *board = dev->board_ptr;
struct das16_private_struct *devpriv;
struct comedi_subdevice *s;
struct comedi_lrange *lrange;
@@ -1219,7 +1219,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void das16_detach(struct comedi_device *dev)
{
- const struct das16_board *board = comedi_board(dev);
+ const struct das16_board *board = dev->board_ptr;
struct das16_private_struct *devpriv = dev->private;
int i;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 19/48] staging: comedi: das1800: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (17 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 18/48] staging: comedi: das16: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 20/48] staging: comedi: das6402: " Ian Abbott
` (30 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/das1800.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 9d0150d..a53d87c 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -453,7 +453,7 @@ static const struct comedi_lrange range_ao_2 = {
static inline uint16_t munge_bipolar_sample(const struct comedi_device *dev,
uint16_t sample)
{
- const struct das1800_board *thisboard = comedi_board(dev);
+ const struct das1800_board *thisboard = dev->board_ptr;
sample += 1 << (thisboard->resolution - 1);
return sample;
@@ -773,7 +773,7 @@ static int das1800_ai_do_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct das1800_board *thisboard = comedi_board(dev);
+ const struct das1800_board *thisboard = dev->board_ptr;
struct das1800_private *devpriv = dev->private;
int err = 0;
unsigned int arg;
@@ -1136,7 +1136,7 @@ static int das1800_ai_rinsn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- const struct das1800_board *thisboard = comedi_board(dev);
+ const struct das1800_board *thisboard = dev->board_ptr;
int i, n;
int chan, range, aref, chan_range;
int timeout = 1000;
@@ -1200,7 +1200,7 @@ static int das1800_ao_winsn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- const struct das1800_board *thisboard = comedi_board(dev);
+ const struct das1800_board *thisboard = dev->board_ptr;
struct das1800_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec);
/* int range = CR_RANGE(insn->chanspec); */
@@ -1329,7 +1329,7 @@ static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0,
static int das1800_probe(struct comedi_device *dev)
{
- const struct das1800_board *board = comedi_board(dev);
+ const struct das1800_board *board = dev->board_ptr;
int index;
int id;
@@ -1412,7 +1412,7 @@ static int das1800_attach(struct comedi_device *dev,
}
dev->board_ptr = das1800_boards + board;
- thisboard = comedi_board(dev);
+ thisboard = dev->board_ptr;
dev->board_name = thisboard->name;
/* if it is an 'ao' board with fancy analog out then we need extra io ports */
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 20/48] staging: comedi: das6402: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (18 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 19/48] staging: comedi: das1800: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 21/48] staging: comedi: das800: " Ian Abbott
` (29 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/das6402.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index 7d9f26a..ab6e406 100644
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -434,7 +434,7 @@ static void das6402_reset(struct comedi_device *dev)
static int das6402_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
- const struct das6402_boardinfo *board = comedi_board(dev);
+ const struct das6402_boardinfo *board = dev->board_ptr;
struct das6402_private *devpriv;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 21/48] staging: comedi: das800: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (19 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 20/48] staging: comedi: das6402: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 22/48] staging: comedi: dt2801: " Ian Abbott
` (28 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/das800.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index cbbb297..d75e552 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -248,7 +248,7 @@ static unsigned das800_ind_read(struct comedi_device *dev, unsigned reg)
static void das800_enable(struct comedi_device *dev)
{
- const struct das800_board *thisboard = comedi_board(dev);
+ const struct das800_board *thisboard = dev->board_ptr;
struct das800_private *devpriv = dev->private;
unsigned long irq_flags;
@@ -325,7 +325,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct das800_board *thisboard = comedi_board(dev);
+ const struct das800_board *thisboard = dev->board_ptr;
struct das800_private *devpriv = dev->private;
int err = 0;
unsigned int arg;
@@ -398,7 +398,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev,
static int das800_ai_do_cmd(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct das800_board *thisboard = comedi_board(dev);
+ const struct das800_board *thisboard = dev->board_ptr;
struct das800_private *devpriv = dev->private;
struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd;
@@ -633,7 +633,7 @@ static int das800_do_insn_bits(struct comedi_device *dev,
static int das800_probe(struct comedi_device *dev)
{
- const struct das800_board *thisboard = comedi_board(dev);
+ const struct das800_board *thisboard = dev->board_ptr;
int board = thisboard ? thisboard - das800_boards : -EINVAL;
int id_bits;
unsigned long irq_flags;
@@ -695,7 +695,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -ENODEV;
}
dev->board_ptr = das800_boards + board;
- thisboard = comedi_board(dev);
+ thisboard = dev->board_ptr;
dev->board_name = thisboard->name;
if (irq > 1 && irq <= 7) {
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 22/48] staging: comedi: dt2801: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (20 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 21/48] staging: comedi: das800: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 23/48] staging: comedi: dt2811: " Ian Abbott
` (27 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/dt2801.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c
index d28d41c..e973863 100644
--- a/drivers/staging/comedi/drivers/dt2801.c
+++ b/drivers/staging/comedi/drivers/dt2801.c
@@ -557,7 +557,7 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it)
havetype:
dev->board_ptr = boardtypes + type;
- board = comedi_board(dev);
+ board = dev->board_ptr;
n_ai_chans = probe_number_of_ai_chans(dev);
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 23/48] staging: comedi: dt2811: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (21 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 22/48] staging: comedi: dt2801: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 24/48] staging: comedi: dt282x: " Ian Abbott
` (26 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/dt2811.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c
index fae9149..1736e39 100644
--- a/drivers/staging/comedi/drivers/dt2811.c
+++ b/drivers/staging/comedi/drivers/dt2811.c
@@ -321,7 +321,7 @@ static int dt2811_do_insn_bits(struct comedi_device *dev,
static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
/* int i; */
- const struct dt2811_board *board = comedi_board(dev);
+ const struct dt2811_board *board = dev->board_ptr;
struct dt2811_private *devpriv;
int ret;
struct comedi_subdevice *s;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 24/48] staging: comedi: dt282x: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (22 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 23/48] staging: comedi: dt2811: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 25/48] staging: comedi: dt3000: " Ian Abbott
` (25 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/dt282x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c
index 4017fcb..e725e3b 100644
--- a/drivers/staging/comedi/drivers/dt282x.c
+++ b/drivers/staging/comedi/drivers/dt282x.c
@@ -681,7 +681,7 @@ static int dt282x_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct dt282x_board *board = comedi_board(dev);
+ const struct dt282x_board *board = dev->board_ptr;
struct dt282x_private *devpriv = dev->private;
int err = 0;
unsigned int arg;
@@ -1149,7 +1149,7 @@ static int dt282x_initialize(struct comedi_device *dev)
*/
static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct dt282x_board *board = comedi_board(dev);
+ const struct dt282x_board *board = dev->board_ptr;
struct dt282x_private *devpriv;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 25/48] staging: comedi: dt3000: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (23 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 24/48] staging: comedi: dt282x: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 26/48] staging: comedi: me4000: " Ian Abbott
` (24 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/dt3000.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 0abe64a..8255610 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -405,7 +405,7 @@ static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *nanosec,
static int dt3k_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
- const struct dt3k_boardtype *this_board = comedi_board(dev);
+ const struct dt3k_boardtype *this_board = dev->board_ptr;
int err = 0;
unsigned int arg;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 26/48] staging: comedi: me4000: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (24 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 25/48] staging: comedi: dt3000: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 27/48] staging: comedi: ni_65xx: " Ian Abbott
` (23 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/me4000.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 3b0df6b..e600ce8 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -471,7 +471,7 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
struct comedi_subdevice *subdevice,
struct comedi_insn *insn, unsigned int *data)
{
- const struct me4000_board *thisboard = comedi_board(dev);
+ const struct me4000_board *thisboard = dev->board_ptr;
int chan = CR_CHAN(insn->chanspec);
int rang = CR_RANGE(insn->chanspec);
int aref = CR_AREF(insn->chanspec);
@@ -599,7 +599,7 @@ static int me4000_ai_check_chanlist(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct me4000_board *board = comedi_board(dev);
+ const struct me4000_board *board = dev->board_ptr;
unsigned int max_diff_chan = board->ai_diff_nchan;
unsigned int aref0 = CR_AREF(cmd->chanlist[0]);
int i;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 27/48] staging: comedi: ni_65xx: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (25 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 26/48] staging: comedi: me4000: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 28/48] staging: comedi: ni_660x: " Ian Abbott
` (22 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_65xx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 63a33de..3b64286 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -294,7 +294,7 @@ MODULE_PARM_DESC(legacy_invert_outputs,
static unsigned int ni_65xx_num_ports(struct comedi_device *dev)
{
- const struct ni_65xx_board *board = comedi_board(dev);
+ const struct ni_65xx_board *board = dev->board_ptr;
return board->num_dio_ports + board->num_di_ports + board->num_do_ports;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 28/48] staging: comedi: ni_660x: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (26 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 27/48] staging: comedi: ni_65xx: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 29/48] staging: comedi: ni_at_a2150: " Ian Abbott
` (21 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_660x.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index b0b03d4..5b6794c 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -433,7 +433,7 @@ struct ni_660x_private {
static inline unsigned ni_660x_num_counters(struct comedi_device *dev)
{
- const struct ni_660x_board *board = comedi_board(dev);
+ const struct ni_660x_board *board = dev->board_ptr;
return board->n_chips * counters_per_chip;
}
@@ -852,7 +852,7 @@ static int ni_660x_allocate_private(struct comedi_device *dev)
static int ni_660x_alloc_mite_rings(struct comedi_device *dev)
{
- const struct ni_660x_board *board = comedi_board(dev);
+ const struct ni_660x_board *board = dev->board_ptr;
struct ni_660x_private *devpriv = dev->private;
unsigned i;
unsigned j;
@@ -870,7 +870,7 @@ static int ni_660x_alloc_mite_rings(struct comedi_device *dev)
static void ni_660x_free_mite_rings(struct comedi_device *dev)
{
- const struct ni_660x_board *board = comedi_board(dev);
+ const struct ni_660x_board *board = dev->board_ptr;
struct ni_660x_private *devpriv = dev->private;
unsigned i;
unsigned j;
@@ -924,7 +924,7 @@ static void ni_660x_select_pfi_output(struct comedi_device *dev,
unsigned pfi_channel,
unsigned output_select)
{
- const struct ni_660x_board *board = comedi_board(dev);
+ const struct ni_660x_board *board = dev->board_ptr;
static const unsigned counter_4_7_first_pfi = 8;
static const unsigned counter_4_7_last_pfi = 23;
unsigned active_chipset = 0;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 29/48] staging: comedi: ni_at_a2150: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (27 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 28/48] staging: comedi: ni_660x: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 30/48] staging: comedi: ni_at_ao: " Ian Abbott
` (20 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_at_a2150.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index d490490..72ec857 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -287,7 +287,7 @@ static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
unsigned int flags)
{
- const struct a2150_board *thisboard = comedi_board(dev);
+ const struct a2150_board *thisboard = dev->board_ptr;
struct a2150_private *devpriv = dev->private;
int lub, glb, temp;
int lub_divisor_shift, lub_index, glb_divisor_shift, glb_index;
@@ -436,7 +436,7 @@ static int a2150_ai_check_chanlist(struct comedi_device *dev,
static int a2150_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
- const struct a2150_board *thisboard = comedi_board(dev);
+ const struct a2150_board *thisboard = dev->board_ptr;
int err = 0;
unsigned int arg;
@@ -710,7 +710,7 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -ENODEV;
dev->board_ptr = a2150_boards + i;
- thisboard = comedi_board(dev);
+ thisboard = dev->board_ptr;
dev->board_name = thisboard->name;
if ((irq >= 3 && irq <= 7) || (irq >= 9 && irq <= 12) ||
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 30/48] staging: comedi: ni_at_ao: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (28 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 29/48] staging: comedi: ni_at_a2150: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 31/48] staging: comedi: ni_atmio16d: " Ian Abbott
` (19 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_at_ao.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index 7a60713..3e1ce58 100644
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -319,7 +319,7 @@ static void atao_reset(struct comedi_device *dev)
static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct atao_board *board = comedi_board(dev);
+ const struct atao_board *board = dev->board_ptr;
struct atao_private *devpriv;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 31/48] staging: comedi: ni_atmio16d: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (29 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 30/48] staging: comedi: ni_at_ao: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 32/48] staging: comedi: ni_atmio: " Ian Abbott
` (18 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_atmio16d.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c
index 2b73079..be541e5 100644
--- a/drivers/staging/comedi/drivers/ni_atmio16d.c
+++ b/drivers/staging/comedi/drivers/ni_atmio16d.c
@@ -602,7 +602,7 @@ static int atmio16d_dio_insn_config(struct comedi_device *dev,
static int atmio16d_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
- const struct atmio16_board_t *board = comedi_board(dev);
+ const struct atmio16_board_t *board = dev->board_ptr;
struct atmio16d_private *devpriv;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 32/48] staging: comedi: ni_atmio: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (30 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 31/48] staging: comedi: ni_atmio16d: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 33/48] staging: comedi: ni_labpc_common: " Ian Abbott
` (17 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_atmio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
index 2bd9f69..0c5ff28 100644
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -336,7 +336,7 @@ static int ni_atmio_attach(struct comedi_device *dev,
return -EIO;
dev->board_ptr = ni_boards + board;
- boardtype = comedi_board(dev);
+ boardtype = dev->board_ptr;
dev->board_name = boardtype->name;
/* irq stuff */
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 33/48] staging: comedi: ni_labpc_common: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (31 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 32/48] staging: comedi: ni_atmio: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 34/48] staging: comedi: ni_labpc_isadma: " Ian Abbott
` (16 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_labpc_common.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_labpc_common.c b/drivers/staging/comedi/drivers/ni_labpc_common.c
index c54c88d..35bc2c2 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_common.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_common.c
@@ -156,7 +156,7 @@ static void labpc_ai_set_chan_and_gain(struct comedi_device *dev,
unsigned int range,
unsigned int aref)
{
- const struct labpc_boardinfo *board = comedi_board(dev);
+ const struct labpc_boardinfo *board = dev->board_ptr;
struct labpc_private *devpriv = dev->private;
if (board->is_labpc1200) {
@@ -186,7 +186,7 @@ static void labpc_setup_cmd6_reg(struct comedi_device *dev,
unsigned int aref,
bool ena_intr)
{
- const struct labpc_boardinfo *board = comedi_board(dev);
+ const struct labpc_boardinfo *board = dev->board_ptr;
struct labpc_private *devpriv = dev->private;
if (!board->is_labpc1200)
@@ -544,7 +544,7 @@ static int labpc_ai_check_chanlist(struct comedi_device *dev,
static int labpc_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
- const struct labpc_boardinfo *board = comedi_board(dev);
+ const struct labpc_boardinfo *board = dev->board_ptr;
int err = 0;
int tmp, tmp2;
unsigned int stop_mask;
@@ -652,7 +652,7 @@ static int labpc_ai_cmdtest(struct comedi_device *dev,
static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
- const struct labpc_boardinfo *board = comedi_board(dev);
+ const struct labpc_boardinfo *board = dev->board_ptr;
struct labpc_private *devpriv = dev->private;
struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd;
@@ -846,7 +846,7 @@ static void labpc_drain_dregs(struct comedi_device *dev)
static irqreturn_t labpc_interrupt(int irq, void *d)
{
struct comedi_device *dev = d;
- const struct labpc_boardinfo *board = comedi_board(dev);
+ const struct labpc_boardinfo *board = dev->board_ptr;
struct labpc_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->read_subdev;
struct comedi_async *async;
@@ -923,7 +923,7 @@ static int labpc_ao_insn_write(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct labpc_boardinfo *board = comedi_board(dev);
+ const struct labpc_boardinfo *board = dev->board_ptr;
struct labpc_private *devpriv = dev->private;
int channel, range;
unsigned long flags;
@@ -1248,7 +1248,7 @@ static int labpc_eeprom_insn_read(struct comedi_device *dev,
int labpc_common_attach(struct comedi_device *dev,
unsigned int irq, unsigned long isr_flags)
{
- const struct labpc_boardinfo *board = comedi_board(dev);
+ const struct labpc_boardinfo *board = dev->board_ptr;
struct labpc_private *devpriv = dev->private;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 34/48] staging: comedi: ni_labpc_isadma: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (32 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 33/48] staging: comedi: ni_labpc_common: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 35/48] staging: comedi: ni_mio_common: " Ian Abbott
` (15 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_labpc_isadma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/ni_labpc_isadma.c b/drivers/staging/comedi/drivers/ni_labpc_isadma.c
index cb7d1c9..967202e 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_isadma.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_isadma.c
@@ -152,7 +152,7 @@ static void handle_isa_dma(struct comedi_device *dev)
void labpc_handle_dma_status(struct comedi_device *dev)
{
- const struct labpc_boardinfo *board = comedi_board(dev);
+ const struct labpc_boardinfo *board = dev->board_ptr;
struct labpc_private *devpriv = dev->private;
/*
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 35/48] staging: comedi: ni_mio_common: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (33 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 34/48] staging: comedi: ni_labpc_isadma: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 36/48] staging: comedi: ni_pcimio: " Ian Abbott
` (14 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_mio_common.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index b34df3a..320b080 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -1186,7 +1186,7 @@ static void ni_ao_fifo_load(struct comedi_device *dev,
static int ni_ao_fifo_half_empty(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
int n;
n = comedi_buf_read_n_available(s);
@@ -1209,7 +1209,7 @@ static int ni_ao_fifo_half_empty(struct comedi_device *dev,
static int ni_ao_prep_fifo(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
int n;
@@ -1296,7 +1296,7 @@ static void ni_ai_fifo_read(struct comedi_device *dev,
static void ni_handle_fifo_half_full(struct comedi_device *dev)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct comedi_subdevice *s = dev->read_subdev;
int n;
@@ -1881,7 +1881,7 @@ static void ni_m_series_load_channelgain_list(struct comedi_device *dev,
unsigned int n_chan,
unsigned int *list)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
unsigned int chan, range, aref;
unsigned int i;
@@ -1988,7 +1988,7 @@ static void ni_load_channelgain_list(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned int n_chan, unsigned int *list)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
unsigned int offset = (s->maxdata + 1) >> 1;
unsigned int chan, range, aref;
@@ -2231,7 +2231,7 @@ static unsigned ni_timer_to_ns(const struct comedi_device *dev, int timer)
static unsigned ni_min_ai_scan_period_ns(struct comedi_device *dev,
unsigned num_channels)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
/* simultaneously-sampled inputs */
@@ -2245,7 +2245,7 @@ static unsigned ni_min_ai_scan_period_ns(struct comedi_device *dev,
static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
int err = 0;
unsigned int tmp;
@@ -2979,7 +2979,7 @@ static int ni_ao_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
switch (data[0]) {
@@ -3080,7 +3080,7 @@ static int ni_ao_inttrig(struct comedi_device *dev,
static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
const struct comedi_cmd *cmd = &s->async->cmd;
int bits;
@@ -3281,7 +3281,7 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
int err = 0;
unsigned int tmp;
@@ -4369,7 +4369,7 @@ static struct caldac_struct caldacs[] = {
static void ni_write_caldac(struct comedi_device *dev, int addr, int val)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
unsigned int loadbit = 0, bits = 0, bit, bitstring = 0;
int i;
@@ -4427,7 +4427,7 @@ static int ni_calib_insn_read(struct comedi_device *dev,
static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
int i, j;
int n_dacs;
@@ -5397,7 +5397,7 @@ static int ni_alloc_private(struct comedi_device *dev)
static int ni_E_init(struct comedi_device *dev,
unsigned interrupt_pin, unsigned irq_polarity)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 36/48] staging: comedi: ni_pcimio: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (34 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 35/48] staging: comedi: ni_mio_common: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 37/48] staging: comedi: pcl711: " Ian Abbott
` (13 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/ni_pcimio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index da61fa7..3b2bdeb 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1082,7 +1082,7 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev)
static void init_6143(struct comedi_device *dev)
{
- const struct ni_board_struct *board = comedi_board(dev);
+ const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private;
/* Disable interrupts */
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 37/48] staging: comedi: pcl711: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (35 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 36/48] staging: comedi: ni_pcimio: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 38/48] staging: comedi: pcl724: " Ian Abbott
` (12 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/pcl711.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c
index 094e513..20ed09c 100644
--- a/drivers/staging/comedi/drivers/pcl711.c
+++ b/drivers/staging/comedi/drivers/pcl711.c
@@ -459,7 +459,7 @@ static int pcl711_do_insn_bits(struct comedi_device *dev,
static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct pcl711_board *board = comedi_board(dev);
+ const struct pcl711_board *board = dev->board_ptr;
struct pcl711_private *devpriv;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 38/48] staging: comedi: pcl724: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (36 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 37/48] staging: comedi: pcl711: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 39/48] staging: comedi: pcl726: " Ian Abbott
` (11 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/pcl724.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/pcl724.c b/drivers/staging/comedi/drivers/pcl724.c
index 84c768f..fcc4408 100644
--- a/drivers/staging/comedi/drivers/pcl724.c
+++ b/drivers/staging/comedi/drivers/pcl724.c
@@ -98,7 +98,7 @@ static int pcl724_8255mapped_io(struct comedi_device *dev,
static int pcl724_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
- const struct pcl724_board *board = comedi_board(dev);
+ const struct pcl724_board *board = dev->board_ptr;
struct comedi_subdevice *s;
unsigned long iobase;
unsigned int iorange;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 39/48] staging: comedi: pcl726: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (37 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 38/48] staging: comedi: pcl724: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 40/48] staging: comedi: pcl730: " Ian Abbott
` (10 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/pcl726.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcl726.c b/drivers/staging/comedi/drivers/pcl726.c
index 855c371..dc179bd 100644
--- a/drivers/staging/comedi/drivers/pcl726.c
+++ b/drivers/staging/comedi/drivers/pcl726.c
@@ -274,7 +274,7 @@ static int pcl726_di_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct pcl726_board *board = comedi_board(dev);
+ const struct pcl726_board *board = dev->board_ptr;
unsigned int val;
if (board->is_pcl727) {
@@ -295,7 +295,7 @@ static int pcl726_do_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct pcl726_board *board = comedi_board(dev);
+ const struct pcl726_board *board = dev->board_ptr;
unsigned long io = dev->iobase;
unsigned int mask;
@@ -322,7 +322,7 @@ static int pcl726_do_insn_bits(struct comedi_device *dev,
static int pcl726_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
- const struct pcl726_board *board = comedi_board(dev);
+ const struct pcl726_board *board = dev->board_ptr;
struct pcl726_private *devpriv;
struct comedi_subdevice *s;
int subdev;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 40/48] staging: comedi: pcl730: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (38 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 39/48] staging: comedi: pcl726: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 41/48] staging: comedi: pcl812: " Ian Abbott
` (9 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/pcl730.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
index bdce24c..a6c5770 100644
--- a/drivers/staging/comedi/drivers/pcl730.c
+++ b/drivers/staging/comedi/drivers/pcl730.c
@@ -270,7 +270,7 @@ static int pcl730_di_insn_bits(struct comedi_device *dev,
static int pcl730_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
- const struct pcl730_board *board = comedi_board(dev);
+ const struct pcl730_board *board = dev->board_ptr;
struct comedi_subdevice *s;
int subdev;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 41/48] staging: comedi: pcl812: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (39 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 40/48] staging: comedi: pcl730: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 42/48] staging: comedi: pcl816: " Ian Abbott
` (8 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/pcl812.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index 61549e3..fd5ea6e 100644
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -713,7 +713,7 @@ static int pcl812_ai_eoc(struct comedi_device *dev,
static int pcl812_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
- const struct pcl812_board *board = comedi_board(dev);
+ const struct pcl812_board *board = dev->board_ptr;
struct pcl812_private *devpriv = dev->private;
int err = 0;
unsigned int flags;
@@ -1080,7 +1080,7 @@ static int pcl812_do_insn_bits(struct comedi_device *dev,
static void pcl812_reset(struct comedi_device *dev)
{
- const struct pcl812_board *board = comedi_board(dev);
+ const struct pcl812_board *board = dev->board_ptr;
struct pcl812_private *devpriv = dev->private;
unsigned int chan;
@@ -1117,7 +1117,7 @@ static void pcl812_set_ai_range_table(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_devconfig *it)
{
- const struct pcl812_board *board = comedi_board(dev);
+ const struct pcl812_board *board = dev->board_ptr;
struct pcl812_private *devpriv = dev->private;
/* default to the range table from the boardinfo */
@@ -1205,7 +1205,7 @@ static void pcl812_set_ai_range_table(struct comedi_device *dev,
static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct pcl812_board *board = comedi_board(dev);
+ const struct pcl812_board *board = dev->board_ptr;
struct pcl812_private *devpriv;
struct comedi_subdevice *s;
int n_subdevices;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 42/48] staging: comedi: pcl816: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (40 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 41/48] staging: comedi: pcl812: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 43/48] staging: comedi: pcl818: " Ian Abbott
` (7 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/pcl816.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c
index 54732c5..aa64871 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -671,7 +671,7 @@ static void pcl816_reset(struct comedi_device *dev)
static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct pcl816_board *board = comedi_board(dev);
+ const struct pcl816_board *board = dev->board_ptr;
struct pcl816_private *devpriv;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 43/48] staging: comedi: pcl818: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (41 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 42/48] staging: comedi: pcl816: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 44/48] staging: comedi: pcmad: " Ian Abbott
` (6 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/pcl818.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index 36c7751..ac19e83 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -738,7 +738,7 @@ static int check_single_ended(unsigned int port)
static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- const struct pcl818_board *board = comedi_board(dev);
+ const struct pcl818_board *board = dev->board_ptr;
struct pcl818_private *devpriv = dev->private;
int err = 0;
unsigned int arg;
@@ -980,7 +980,7 @@ static int pcl818_do_insn_bits(struct comedi_device *dev,
static void pcl818_reset(struct comedi_device *dev)
{
- const struct pcl818_board *board = comedi_board(dev);
+ const struct pcl818_board *board = dev->board_ptr;
unsigned long timer_base = dev->iobase + PCL818_TIMER_BASE;
unsigned int chan;
@@ -1018,7 +1018,7 @@ static void pcl818_set_ai_range_table(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_devconfig *it)
{
- const struct pcl818_board *board = comedi_board(dev);
+ const struct pcl818_board *board = dev->board_ptr;
/* default to the range table from the boardinfo */
s->range_table = board->ai_range_type;
@@ -1067,7 +1067,7 @@ static void pcl818_set_ai_range_table(struct comedi_device *dev,
static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct pcl818_board *board = comedi_board(dev);
+ const struct pcl818_board *board = dev->board_ptr;
struct pcl818_private *devpriv;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 44/48] staging: comedi: pcmad: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (42 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 43/48] staging: comedi: pcl818: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 45/48] staging: comedi: pcmuio: " Ian Abbott
` (5 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/pcmad.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index 87c61d9b..e3ac8ac 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -112,7 +112,7 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct pcmad_board_struct *board = comedi_board(dev);
+ const struct pcmad_board_struct *board = dev->board_ptr;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 45/48] staging: comedi: pcmuio: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (43 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 44/48] staging: comedi: pcmad: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 46/48] staging: comedi: rtd520: " Ian Abbott
` (4 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/pcmuio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 1bca3fb..3aedeca 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -279,7 +279,7 @@ static int pcmuio_dio_insn_config(struct comedi_device *dev,
static void pcmuio_reset(struct comedi_device *dev)
{
- const struct pcmuio_board *board = comedi_board(dev);
+ const struct pcmuio_board *board = dev->board_ptr;
int asic;
for (asic = 0; asic < board->num_asics; ++asic) {
@@ -587,7 +587,7 @@ static int pcmuio_cmdtest(struct comedi_device *dev,
static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct pcmuio_board *board = comedi_board(dev);
+ const struct pcmuio_board *board = dev->board_ptr;
struct comedi_subdevice *s;
struct pcmuio_private *devpriv;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 46/48] staging: comedi: rtd520: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (44 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 45/48] staging: comedi: pcmuio: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 47/48] staging: comedi: rti800: " Ian Abbott
` (3 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/rtd520.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 2ea4a5c..f0bf3ed 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -437,7 +437,7 @@ static int rtd_ns_to_timer(unsigned int *ns, unsigned int flags)
static unsigned short rtd_convert_chan_gain(struct comedi_device *dev,
unsigned int chanspec, int index)
{
- const struct rtd_boardinfo *board = comedi_board(dev);
+ const struct rtd_boardinfo *board = dev->board_ptr;
struct rtd_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(chanspec);
unsigned int range = CR_RANGE(chanspec);
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 47/48] staging: comedi: rti800: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (45 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 46/48] staging: comedi: rtd520: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 10:26 ` [PATCH 48/48] staging: comedi: vmk80xx: " Ian Abbott
` (2 subsequent siblings)
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/rti800.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 4df979e..e3d9f44 100644
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -258,7 +258,7 @@ static int rti800_do_insn_bits(struct comedi_device *dev,
static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
- const struct rti800_board *board = comedi_board(dev);
+ const struct rti800_board *board = dev->board_ptr;
struct rti800_private *devpriv;
struct comedi_subdevice *s;
int ret;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH 48/48] staging: comedi: vmk80xx: replace comedi_board() calls
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (46 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 47/48] staging: comedi: rti800: " Ian Abbott
@ 2014-09-09 10:26 ` Ian Abbott
2014-09-09 16:28 ` [PATCH 00/48] staging: comedi: avoid using comedi_board() Hartley Sweeten
2014-09-11 17:57 ` Hartley Sweeten
49 siblings, 0 replies; 53+ messages in thread
From: Ian Abbott @ 2014-09-09 10:26 UTC (permalink / raw)
To: driverdev-devel
Cc: Greg Kroah-Hartman, Ian Abbott, H Hartley Sweeten, linux-kernel
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/vmk80xx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index 831c3b7..7100341 100644
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -767,7 +767,7 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev)
static int vmk80xx_init_subdevices(struct comedi_device *dev)
{
- const struct vmk80xx_board *boardinfo = comedi_board(dev);
+ const struct vmk80xx_board *boardinfo = dev->board_ptr;
struct vmk80xx_private *devpriv = dev->private;
struct comedi_subdevice *s;
int n_subd;
--
2.1.0
^ permalink raw reply related [flat|nested] 53+ messages in thread* RE: [PATCH 00/48] staging: comedi: avoid using comedi_board()
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (47 preceding siblings ...)
2014-09-09 10:26 ` [PATCH 48/48] staging: comedi: vmk80xx: " Ian Abbott
@ 2014-09-09 16:28 ` Hartley Sweeten
2014-09-11 17:57 ` Hartley Sweeten
49 siblings, 0 replies; 53+ messages in thread
From: Hartley Sweeten @ 2014-09-09 16:28 UTC (permalink / raw)
To: Ian Abbott, driverdev-devel; +Cc: Greg Kroah-Hartman, linux-kernel
On Tuesday, September 09, 2014 3:26 AM, Ian Abbott wrote:
>
> The `comedi_board` inline function takes a single parameter of type
> `struct comedi_device *` and merely returns the value of the `board_ptr`
> member therein. This is somewhat superfluous as the member can be
> accessed directly.
>
> Replace all uses of `comedi_board(dev)` with `dev->board_ptr`.
>
> Note, if there are any conflicts when applying this series, they can
> just be skipped for now and corrected later.
>
> A subsequent patch will remove the `comedi_board` function, once there
> is nothing using it.
I would argue that the comedi_board() inline is a bit cleaner.
But, since all the goofy macros and private boardinfo access functions in
the drivers have been removed I guess this can go now. We will need
to make that sure any new drivers don't introduce new goofy macros
or access functions. The 'board(dev)->foo' ones really made the drivers
hard to read...
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
^ permalink raw reply [flat|nested] 53+ messages in thread* RE: [PATCH 00/48] staging: comedi: avoid using comedi_board()
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
` (48 preceding siblings ...)
2014-09-09 16:28 ` [PATCH 00/48] staging: comedi: avoid using comedi_board() Hartley Sweeten
@ 2014-09-11 17:57 ` Hartley Sweeten
2014-09-11 21:37 ` Greg Kroah-Hartman
49 siblings, 1 reply; 53+ messages in thread
From: Hartley Sweeten @ 2014-09-11 17:57 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Ian Abbott, driverdev-devel, linux-kernel
On Tuesday, September 09, 2014 3:26 AM, Ian Abbott wrote:
> The `comedi_board` inline function takes a single parameter of type
> `struct comedi_device *` and merely returns the value of the `board_ptr`
> member therein. This is somewhat superfluous as the member can be
> accessed directly.
>
> Replace all uses of `comedi_board(dev)` with `dev->board_ptr`.
>
> Note, if there are any conflicts when applying this series, they can
> just be skipped for now and corrected later.
>
> A subsequent patch will remove the `comedi_board` function, once there
> is nothing using it.
Greg,
Just wanted to give you a heads up on this series and the ones I have
posted. The series are:
>From Ian, [PATCH 00/48] staging: comedi: avoid using comedi_board()
>From me, [PATCH 00/30] staging: comedi: adl_pci9118: continue cleanup
>From me, [PATCH 00/34] staging: comedi: cleanup async cmd->stop_{src,arg} usage
There are a couple conflicts between the series from Ian and my two.
If you drop these two from Ian's series:
06) staging: comedi: adl_pci9118: replace comedi_board() calls
10) staging: comedi: amplc_dio200_common: replace comedi_board() calls
The rest will apply cleanly in the order above (assuming I didn't miss anything).
Also, Ian had a couple issues with patch 07/34 and 08/34 from the last
series I posted. I already asked if you could drop those two. I needed I
will repost the series.
Thanks,
Hartley
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH 00/48] staging: comedi: avoid using comedi_board()
2014-09-11 17:57 ` Hartley Sweeten
@ 2014-09-11 21:37 ` Greg Kroah-Hartman
2014-09-11 22:00 ` Hartley Sweeten
0 siblings, 1 reply; 53+ messages in thread
From: Greg Kroah-Hartman @ 2014-09-11 21:37 UTC (permalink / raw)
To: Hartley Sweeten; +Cc: Ian Abbott, driverdev-devel, linux-kernel
On Thu, Sep 11, 2014 at 05:57:34PM +0000, Hartley Sweeten wrote:
> On Tuesday, September 09, 2014 3:26 AM, Ian Abbott wrote:
> > The `comedi_board` inline function takes a single parameter of type
> > `struct comedi_device *` and merely returns the value of the `board_ptr`
> > member therein. This is somewhat superfluous as the member can be
> > accessed directly.
> >
> > Replace all uses of `comedi_board(dev)` with `dev->board_ptr`.
> >
> > Note, if there are any conflicts when applying this series, they can
> > just be skipped for now and corrected later.
> >
> > A subsequent patch will remove the `comedi_board` function, once there
> > is nothing using it.
>
> Greg,
>
> Just wanted to give you a heads up on this series and the ones I have
> posted. The series are:
>
> >From Ian, [PATCH 00/48] staging: comedi: avoid using comedi_board()
> >From me, [PATCH 00/30] staging: comedi: adl_pci9118: continue cleanup
> >From me, [PATCH 00/34] staging: comedi: cleanup async cmd->stop_{src,arg} usage
>
> There are a couple conflicts between the series from Ian and my two.
> If you drop these two from Ian's series:
>
> 06) staging: comedi: adl_pci9118: replace comedi_board() calls
> 10) staging: comedi: amplc_dio200_common: replace comedi_board() calls
>
> The rest will apply cleanly in the order above (assuming I didn't miss anything).
I applied all of the above, with the 2 patches from Ian going last and
git handling the merge issues.
> Also, Ian had a couple issues with patch 07/34 and 08/34 from the last
> series I posted. I already asked if you could drop those two. I needed I
> will repost the series.
I've dropped them. Hopefully I got it all right, it should all be
pushed out now, verifying this would be good :)
thanks,
greg k-h
^ permalink raw reply [flat|nested] 53+ messages in thread* RE: [PATCH 00/48] staging: comedi: avoid using comedi_board()
2014-09-11 21:37 ` Greg Kroah-Hartman
@ 2014-09-11 22:00 ` Hartley Sweeten
0 siblings, 0 replies; 53+ messages in thread
From: Hartley Sweeten @ 2014-09-11 22:00 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Ian Abbott, driverdev-devel, linux-kernel
On Thursday, September 11, 2014 2:38 PM, Greg Kroah-Hartman wrote:
> On Thu, Sep 11, 2014 at 05:57:34PM +0000, Hartley Sweeten wrote:
>> Just wanted to give you a heads up on this series and the ones I have
>> posted. The series are:
>>
>>> From Ian, [PATCH 00/48] staging: comedi: avoid using comedi_board()
>>> From me, [PATCH 00/30] staging: comedi: adl_pci9118: continue cleanup
>>> From me, [PATCH 00/34] staging: comedi: cleanup async cmd->stop_{src,arg} usage
>>
>> There are a couple conflicts between the series from Ian and my two.
>> If you drop these two from Ian's series:
>>
>> 06) staging: comedi: adl_pci9118: replace comedi_board() calls
>> 10) staging: comedi: amplc_dio200_common: replace comedi_board() calls
>>
>> The rest will apply cleanly in the order above (assuming I didn't miss anything).
>
> I applied all of the above, with the 2 patches from Ian going last and
> git handling the merge issues.
>
>> Also, Ian had a couple issues with patch 07/34 and 08/34 from the last
>> series I posted. I already asked if you could drop those two. I needed I
>> will repost the series.
>
> I've dropped them. Hopefully I got it all right, it should all be
> pushed out now, verifying this would be good :)
A quick glance looks like everything is right. I'll give it a better look
when it hits linux-next.
Thanks,
Hartley
^ permalink raw reply [flat|nested] 53+ messages in thread