Skip to content

Commit

Permalink
staging: comedi_pci: pass comedi_device to comedi_pci_enable()
Browse files Browse the repository at this point in the history 
Make comedi_pci_enable() use the same parameter type as
comedi_pci_disable(). This also allows comedi_pci_enable
to automatically determine the resource name passed to
pci_request_regions().

Make sure the errno value returned is passed on instead of
assuming an errno. Also, remove any kernel noise that is
generated when the call fails.

The National Instruments drivers that use the mite module
currently enable the PCI device in the mite module. For
those drivers move the call to comedi_pci_enable into the
driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 14, 2013
1 parent 7f072f5 commit 818f569
Show file tree
Hide file tree
Showing 53 changed files with 110 additions and 98 deletions.
13 changes: 9 additions & 4 deletions drivers/staging/comedi/comedi_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,23 @@ EXPORT_SYMBOL_GPL(comedi_to_pci_dev);

/**
* comedi_pci_enable() - Enable the PCI device and request the regions.
* @pcidev: pci_dev struct
* @res_name: name for the requested reqource
* @dev: comedi_device struct
*/
int comedi_pci_enable(struct pci_dev *pcidev, const char *res_name)
int comedi_pci_enable(struct comedi_device *dev)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
int rc;

if (!pcidev)
return -ENODEV;

rc = pci_enable_device(pcidev);
if (rc < 0)
return rc;

rc = pci_request_regions(pcidev, res_name);
rc = pci_request_regions(pcidev, dev->board_name
? dev->board_name
: dev->driver->driver_name);
if (rc < 0)
pci_disable_device(pcidev);

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/comedidev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ struct pci_driver;

struct pci_dev *comedi_to_pci_dev(struct comedi_device *);

int comedi_pci_enable(struct pci_dev *, const char *);
int comedi_pci_enable(struct comedi_device *);
void comedi_pci_disable(struct comedi_device *);

int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *,
Expand Down Expand Up @@ -421,7 +421,7 @@ static inline struct pci_dev *comedi_to_pci_dev(struct comedi_device *dev)
return NULL;
}

static inline int comedi_pci_enable(struct pci_dev *dev, const char *name)
static inline int comedi_pci_enable(struct comedi_device *dev)
{
return -ENOSYS;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/8255_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ static int pci_8255_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
iobase = pci_resource_start(pcidev, board->dio_badr);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi-data/addi_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static int addi_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi_apci_1032.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ static int apci1032_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi_apci_1516.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static int apci1516_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi_apci_16xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static int apci16xx_auto_attach(struct comedi_device *dev,
dev->board_ptr = board;
dev->board_name = board->name;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi_apci_1710.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static int apci1710_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi_apci_2032.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,

dev->board_name = dev->driver->driver_name;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 1);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi_apci_2200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static int apci2200_auto_attach(struct comedi_device *dev,

dev->board_name = dev->driver->driver_name;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi_apci_3120.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
pci_set_master(pcidev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi_apci_3501.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ static int apci3501_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adl_pci6208.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static int pci6208_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 2);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adl_pci7x3x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static int adl_pci7x3x_auto_attach(struct comedi_device *dev,
dev->board_ptr = board;
dev->board_name = board->name;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 2);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adl_pci8164.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static int adl_pci8164_auto_attach(struct comedi_device *dev,

dev->board_name = dev->driver->driver_name;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 2);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adl_pci9111.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ static int pci9111_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = dev_private;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev_private->lcr_io_base = pci_resource_start(pcidev, 1);
Expand Down
7 changes: 2 additions & 5 deletions drivers/staging/comedi/drivers/adl_pci9118.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1970,12 +1970,9 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
u16 u16w;

dev->board_name = this_board->name;
ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret) {
dev_err(dev->class_dev,
"cannot enable PCI device %s\n", pci_name(pcidev));
ret = comedi_pci_enable(dev);
if (ret)
return ret;
}
if (master)
pci_set_master(pcidev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adv_pci1710.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@ static int pci1710_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 2);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adv_pci1723.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ static int pci1723_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 2);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adv_pci1724.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ static int adv_pci1724_auto_attach(struct comedi_device *dev,

dev->board_name = dev->driver->driver_name;

retval = comedi_pci_enable(pcidev, dev->board_name);
retval = comedi_pci_enable(dev);
if (retval)
return retval;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adv_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ static int pci_dio_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, this_board->main_pci_region);
Expand Down
9 changes: 4 additions & 5 deletions drivers/staging/comedi/drivers/amplc_dio200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1950,12 +1950,11 @@ static int dio200_auto_attach(struct comedi_device *dev,
return -EINVAL;
}
thisboard = comedi_board(dev);
ret = comedi_pci_enable(pci_dev, DIO200_DRIVER_NAME);
if (ret < 0) {
dev_err(dev->class_dev,
"error! cannot enable PCI device and request regions!\n");

ret = comedi_pci_enable(dev);
if (ret)
return ret;
}

bar = thisboard->mainbar;
base = pci_resource_start(pci_dev, bar);
len = pci_resource_len(pci_dev, bar);
Expand Down
8 changes: 3 additions & 5 deletions drivers/staging/comedi/drivers/amplc_pc236.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,12 +470,10 @@ static int pc236_pci_common_attach(struct comedi_device *dev,

comedi_set_hw_dev(dev, &pci_dev->dev);

ret = comedi_pci_enable(pci_dev, PC236_DRIVER_NAME);
if (ret < 0) {
dev_err(dev->class_dev,
"error! cannot enable PCI device and request regions!\n");
ret = comedi_pci_enable(dev);
if (ret)
return ret;
}

devpriv->lcr_iobase = pci_resource_start(pci_dev, 1);
iobase = pci_resource_start(pci_dev, 2);
return pc236_common_attach(dev, iobase, pci_dev->irq, IRQF_SHARED);
Expand Down
8 changes: 3 additions & 5 deletions drivers/staging/comedi/drivers/amplc_pc263.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,11 @@ static int pc263_pci_common_attach(struct comedi_device *dev,

comedi_set_hw_dev(dev, &pci_dev->dev);

ret = comedi_pci_enable(pci_dev, PC263_DRIVER_NAME);
if (ret < 0) {
dev_err(dev->class_dev,
"error! cannot enable PCI device and request regions!\n");
ret = comedi_pci_enable(dev);
if (ret)
return ret;
}
iobase = pci_resource_start(pci_dev, 2);

return pc263_common_attach(dev, iobase);
}

Expand Down
9 changes: 3 additions & 6 deletions drivers/staging/comedi/drivers/amplc_pci224.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1280,13 +1280,10 @@ static int pci224_attach_common(struct comedi_device *dev,

comedi_set_hw_dev(dev, &pci_dev->dev);

ret = comedi_pci_enable(pci_dev, DRIVER_NAME);
if (ret < 0) {
dev_err(dev->class_dev,
"error! cannot enable PCI device and request regions!\n"
);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
}

spin_lock_init(&devpriv->ao_spinlock);

devpriv->iobase1 = pci_resource_start(pci_dev, 2);
Expand Down
11 changes: 5 additions & 6 deletions drivers/staging/comedi/drivers/amplc_pci230.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2645,12 +2645,11 @@ static int pci230_attach_common(struct comedi_device *dev,
comedi_set_hw_dev(dev, &pci_dev->dev);

dev->board_name = thisboard->name;
/* Enable PCI device and reserve I/O spaces. */
if (comedi_pci_enable(pci_dev, "amplc_pci230") < 0) {
dev_err(dev->class_dev,
"failed to enable PCI device and request regions\n");
return -EIO;
}

rc = comedi_pci_enable(dev);
if (rc)
return rc;

/* Read base addresses of the PCI230's two I/O regions from PCI
* configuration register. */
iobase1 = pci_resource_start(pci_dev, 2);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/cb_pcidas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1;
Expand Down
8 changes: 3 additions & 5 deletions drivers/staging/comedi/drivers/cb_pcidas64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4059,11 +4059,9 @@ static int auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

if (comedi_pci_enable(pcidev, dev->driver->driver_name)) {
dev_warn(dev->class_dev,
"failed to enable PCI device and request regions\n");
return -EIO;
}
retval = comedi_pci_enable(dev);
if (retval)
return retval;
pci_set_master(pcidev);

/* Initialize dev->board_name */
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/cb_pcidda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ static int cb_pcidda_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 3);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/cb_pcimdas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static int cb_pcimdas_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/cb_pcimdda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ static int cb_pcimdda_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 3);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/contec_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static int contec_auto_attach(struct comedi_device *dev,

dev->board_name = dev->driver->driver_name;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 0);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/daqboard2000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,8 @@ static int daqboard2000_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

result = comedi_pci_enable(pcidev, dev->driver->driver_name);
if (result < 0)
result = comedi_pci_enable(dev);
if (result)
return result;
dev->iobase = 1; /* the "detach" needs this */

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/das08_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static int das08_pci_auto_attach(struct comedi_device *dev,
/* The das08 driver needs the board_ptr */
dev->board_ptr = &das08_pci_boards[0];

ret = comedi_pci_enable(pdev, dev->driver->driver_name);
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = pci_resource_start(pdev, 2);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/dt3000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ static int dt3000_auto_attach(struct comedi_device *dev,
return -ENOMEM;
dev->private = devpriv;

ret = comedi_pci_enable(pcidev, dev->board_name);
ret = comedi_pci_enable(dev);
if (ret < 0)
return ret;
dev->iobase = 1; /* the "detach" needs this */
Expand Down
Loading

0 comments on commit 818f569

Please sign in to comment.