Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 304314
b: refs/heads/master
c: 4c093a6
h: refs/heads/master
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Apr 10, 2012
1 parent 5cfcf6f commit 1e3775b
Show file tree
Hide file tree
Showing 49 changed files with 64 additions and 53 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e3c024df12adf8a4c44d0d21d5c8edcdf083209
refs/heads/master: 4c093a6dc2240fd54d71a25b284e02d51509e430
6 changes: 4 additions & 2 deletions trunk/drivers/staging/comedi/comedidev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,10 +456,12 @@ static inline void *comedi_aux_data(int options[], int n)
int comedi_alloc_subdevice_minor(struct comedi_device *dev,
struct comedi_subdevice *s);
void comedi_free_subdevice_minor(struct comedi_subdevice *s);
int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name);
int comedi_pci_auto_config(struct pci_dev *pcidev,
struct comedi_driver *driver);
void comedi_pci_auto_unconfig(struct pci_dev *pcidev);
struct usb_device; /* forward declaration */
int comedi_usb_auto_config(struct usb_device *usbdev, const char *board_name);
int comedi_usb_auto_config(struct usb_device *usbdev,
struct comedi_driver *driver);
void comedi_usb_auto_unconfig(struct usb_device *usbdev);

#ifdef CONFIG_COMEDI_PCI_DRIVERS
Expand Down
9 changes: 5 additions & 4 deletions trunk/drivers/staging/comedi/drivers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ static void comedi_auto_unconfig(struct device *hardware_device)
kfree(minor);
}

int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name)
int comedi_pci_auto_config(struct pci_dev *pcidev, struct comedi_driver *driver)
{
int options[2];

Expand All @@ -883,7 +883,7 @@ int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name)
/* pci slot */
options[1] = PCI_SLOT(pcidev->devfn);

return comedi_auto_config(&pcidev->dev, board_name,
return comedi_auto_config(&pcidev->dev, driver->driver_name,
options, ARRAY_SIZE(options));
}
EXPORT_SYMBOL_GPL(comedi_pci_auto_config);
Expand All @@ -894,10 +894,11 @@ void comedi_pci_auto_unconfig(struct pci_dev *pcidev)
}
EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig);

int comedi_usb_auto_config(struct usb_device *usbdev, const char *board_name)
int comedi_usb_auto_config(struct usb_device *usbdev,
struct comedi_driver *driver)
{
BUG_ON(usbdev == NULL);
return comedi_auto_config(&usbdev->dev, board_name, NULL, 0);
return comedi_auto_config(&usbdev->dev, driver->driver_name, NULL, 0);
}
EXPORT_SYMBOL_GPL(comedi_usb_auto_config);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2543,7 +2543,7 @@ static struct comedi_driver driver_addi = {
static int __devinit driver_addi_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_addi.driver_name);
return comedi_pci_auto_config(dev, &driver_addi);
}

static void __devexit driver_addi_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adl_pci6208.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ static struct comedi_driver driver_pci6208 = {
static int __devinit driver_pci6208_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_pci6208.driver_name);
return comedi_pci_auto_config(dev, &driver_pci6208);
}

static void __devexit driver_pci6208_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adl_pci7230.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ static int __devinit driver_adl_pci7230_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_adl_pci7230.driver_name);
return comedi_pci_auto_config(dev, &driver_adl_pci7230);
}

static void __devexit driver_adl_pci7230_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adl_pci7296.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static int __devinit driver_adl_pci7296_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_adl_pci7296.driver_name);
return comedi_pci_auto_config(dev, &driver_adl_pci7296);
}

static void __devexit driver_adl_pci7296_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adl_pci7432.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ static int __devinit driver_adl_pci7432_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_adl_pci7432.driver_name);
return comedi_pci_auto_config(dev, &driver_adl_pci7432);
}

static void __devexit driver_adl_pci7432_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adl_pci8164.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ static int __devinit driver_adl_pci8164_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_adl_pci8164.driver_name);
return comedi_pci_auto_config(dev, &driver_adl_pci8164);
}

static void __devexit driver_adl_pci8164_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adl_pci9111.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ static struct comedi_driver pci9111_driver = {
static int __devinit pci9111_driver_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, pci9111_driver.driver_name);
return comedi_pci_auto_config(dev, &pci9111_driver);
}

static void __devexit pci9111_driver_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adl_pci9118.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ static struct comedi_driver driver_pci9118 = {
static int __devinit driver_pci9118_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_pci9118.driver_name);
return comedi_pci_auto_config(dev, &driver_pci9118);
}

static void __devexit driver_pci9118_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adv_pci1710.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1612,7 +1612,7 @@ static int pci1710_detach(struct comedi_device *dev)
static int __devinit driver_pci1710_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_pci1710.driver_name);
return comedi_pci_auto_config(dev, &driver_pci1710);
}

static void __devexit driver_pci1710_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adv_pci1723.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ static int pci1723_detach(struct comedi_device *dev)
static int __devinit driver_pci1723_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_pci1723.driver_name);
return comedi_pci_auto_config(dev, &driver_pci1723);
}

static void __devexit driver_pci1723_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/adv_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ static int pci_dio_detach(struct comedi_device *dev)
static int __devinit driver_pci_dio_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_pci_dio.driver_name);
return comedi_pci_auto_config(dev, &driver_pci_dio);
}

static void __devexit driver_pci_dio_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/amplc_dio200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ static int __devinit driver_amplc_dio200_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_amplc_dio200.driver_name);
return comedi_pci_auto_config(dev, &driver_amplc_dio200);
}

static void __devexit driver_amplc_dio200_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/amplc_pc236.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static int __devinit driver_amplc_pc236_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_amplc_pc236.driver_name);
return comedi_pci_auto_config(dev, &driver_amplc_pc236);
}

static void __devexit driver_amplc_pc236_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/amplc_pc263.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ static int __devinit driver_amplc_pc263_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_amplc_pc263.driver_name);
return comedi_pci_auto_config(dev, &driver_amplc_pc263);
}

static void __devexit driver_amplc_pc263_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/amplc_pci224.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ static int __devinit driver_amplc_pci224_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_amplc_pci224.driver_name);
return comedi_pci_auto_config(dev, &driver_amplc_pci224);
}

static void __devexit driver_amplc_pci224_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/amplc_pci230.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ static int __devinit driver_amplc_pci230_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_amplc_pci230.driver_name);
return comedi_pci_auto_config(dev, &driver_amplc_pci230);
}

static void __devexit driver_amplc_pci230_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/cb_pcidas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1925,7 +1925,7 @@ static int nvram_read(struct comedi_device *dev, unsigned int address,
static int __devinit driver_cb_pcidas_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_cb_pcidas.driver_name);
return comedi_pci_auto_config(dev, &driver_cb_pcidas);
}

static void __devexit driver_cb_pcidas_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,7 @@ static void load_ao_dma(struct comedi_device *dev,
static int __devinit driver_cb_pcidas_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_cb_pcidas.driver_name);
return comedi_pci_auto_config(dev, &driver_cb_pcidas);
}

static void __devexit driver_cb_pcidas_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/cb_pcidda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel,
static int __devinit driver_cb_pcidda_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_cb_pcidda.driver_name);
return comedi_pci_auto_config(dev, &driver_cb_pcidda);
}

static void __devexit driver_cb_pcidda_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/cb_pcidio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static int pcidio_detach(struct comedi_device *dev)
static int __devinit driver_cb_pcidio_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_cb_pcidio.driver_name);
return comedi_pci_auto_config(dev, &driver_cb_pcidio);
}

static void __devexit driver_cb_pcidio_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ static int __devinit driver_cb_pcimdas_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_cb_pcimdas.driver_name);
return comedi_pci_auto_config(dev, &driver_cb_pcimdas);
}

static void __devexit driver_cb_pcimdas_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static int __devinit cb_pcimdda_driver_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, cb_pcimdda_driver.driver_name);
return comedi_pci_auto_config(dev, &cb_pcimdda_driver);
}

static void __devexit cb_pcimdda_driver_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/contec_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ static int contec_di_insn_bits(struct comedi_device *dev,
static int __devinit driver_contec_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_contec.driver_name);
return comedi_pci_auto_config(dev, &driver_contec);
}

static void __devexit driver_contec_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/daqboard2000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ static int __devinit driver_daqboard2000_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
{
return comedi_pci_auto_config(dev, driver_daqboard2000.driver_name);
return comedi_pci_auto_config(dev, &driver_daqboard2000);
}

static void __devexit driver_daqboard2000_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/das08.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ EXPORT_SYMBOL_GPL(das08_common_detach);
static int __devinit driver_das08_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_das08.driver_name);
return comedi_pci_auto_config(dev, &driver_das08);
}

static void __devexit driver_das08_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/dt3000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ static struct comedi_driver driver_dt3000 = {
static int __devinit driver_dt3000_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_dt3000.driver_name);
return comedi_pci_auto_config(dev, &driver_dt3000);
}

static void __devexit driver_dt3000_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ static int dyna_pci10xx_detach(struct comedi_device *dev)
static int __devinit driver_dyna_pci10xx_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_dyna_pci10xx.driver_name);
return comedi_pci_auto_config(dev, &driver_dyna_pci10xx);
}

static void __devexit driver_dyna_pci10xx_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ static struct comedi_driver driver_hpdi = {
static int __devinit driver_hpdi_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_hpdi.driver_name);
return comedi_pci_auto_config(dev, &driver_hpdi);
}

static void __devexit driver_hpdi_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/jr3_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ static int jr3_pci_detach(struct comedi_device *dev)
static int __devinit driver_jr3_pci_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_jr3_pci.driver_name);
return comedi_pci_auto_config(dev, &driver_jr3_pci);
}

static void __devexit driver_jr3_pci_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ke_counter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static struct comedi_driver cnt_driver = {
static int __devinit cnt_driver_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, cnt_driver.driver_name);
return comedi_pci_auto_config(dev, &cnt_driver);
}

static void __devexit cnt_driver_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/me4000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2427,7 +2427,7 @@ static int me4000_cnt_insn_write(struct comedi_device *dev,
static int __devinit driver_me4000_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_me4000.driver_name);
return comedi_pci_auto_config(dev, &driver_me4000);
}

static void __devexit driver_me4000_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/me_daq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static struct comedi_driver me_driver = {
static int __devinit me_driver_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, me_driver.driver_name);
return comedi_pci_auto_config(dev, &me_driver);
}

static void __devexit me_driver_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_6527.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ static int ni6527_find_device(struct comedi_device *dev, int bus, int slot)
static int __devinit driver_ni6527_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_ni6527.driver_name);
return comedi_pci_auto_config(dev, &driver_ni6527);
}

static void __devexit driver_ni6527_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_65xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ static int ni_65xx_find_device(struct comedi_device *dev, int bus, int slot)
static int __devinit driver_ni_65xx_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_ni_65xx.driver_name);
return comedi_pci_auto_config(dev, &driver_ni_65xx);
}

static void __devexit driver_ni_65xx_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_660x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ static struct comedi_driver driver_ni_660x = {
static int __devinit driver_ni_660x_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_ni_660x.driver_name);
return comedi_pci_auto_config(dev, &driver_ni_660x);
}

static void __devexit driver_ni_660x_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_670x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static struct comedi_driver driver_ni_670x = {
static int __devinit driver_ni_670x_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_ni_670x.driver_name);
return comedi_pci_auto_config(dev, &driver_ni_670x);
}

static void __devexit driver_ni_670x_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_labpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2141,7 +2141,7 @@ static void write_caldac(struct comedi_device *dev, unsigned int channel,
static int __devinit driver_labpc_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_labpc.driver_name);
return comedi_pci_auto_config(dev, &driver_labpc);
}

static void __devexit driver_labpc_pci_remove(struct pci_dev *dev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_pcidio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ static int nidio_find_device(struct comedi_device *dev, int bus, int slot)
static int __devinit driver_pcidio_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, driver_pcidio.driver_name);
return comedi_pci_auto_config(dev, &driver_pcidio);
}

static void __devexit driver_pcidio_pci_remove(struct pci_dev *dev)
Expand Down
Loading

0 comments on commit 1e3775b

Please sign in to comment.