From 5eefb6205da478178d22aa6915b6e97c89342763 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Sat, 27 Oct 2012 21:44:13 +0100 Subject: [PATCH] --- yaml --- r: 337359 b: refs/heads/master c: 156096a0398fd5c42beeed87ad9b79134d890d22 h: refs/heads/master i: 337357: 7fa4a2faf143c72562b2986aeb29798c58493b93 337355: 73fb55b1b0298371d3486dbf0d7fd7b08013708d 337351: f37112f0b54eea61accde445f19d8e2425f1cb9b 337343: e2136d2d3425cb3597651f5794eeb81c38a20e7c v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index c08c3bfb85cf..6771c100edc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9c3e4e7a797ec7c0de3ad6372ca332692cd0115 +refs/heads/master: 156096a0398fd5c42beeed87ad9b79134d890d22 diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index 2c3db49c0dfd..4e61f5bd6792 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -879,8 +879,8 @@ comedi_auto_config_helper(struct device *hardware_device, return ret; } -static int comedi_auto_config_wrapper(struct comedi_device *dev, - unsigned long context) +static int comedi_old_auto_config_wrapper(struct comedi_device *dev, + unsigned long context) { struct comedi_devconfig *it = (struct comedi_devconfig *)context; struct comedi_driver *driv = dev->driver; @@ -906,9 +906,9 @@ static int comedi_auto_config_wrapper(struct comedi_device *dev, return driv->attach(dev, it); } -static int comedi_auto_config(struct device *hardware_device, - struct comedi_driver *driver, const int *options, - unsigned num_options) +static int comedi_old_auto_config(struct device *hardware_device, + struct comedi_driver *driver, + const int *options, unsigned num_options) { struct comedi_devconfig it; @@ -918,7 +918,7 @@ static int comedi_auto_config(struct device *hardware_device, BUG_ON(num_options > COMEDI_NDEVCONFOPTS); memcpy(it.options, options, num_options * sizeof(int)); return comedi_auto_config_helper(hardware_device, driver, - comedi_auto_config_wrapper, + comedi_old_auto_config_wrapper, (unsigned long)&it); } @@ -979,8 +979,8 @@ static int comedi_old_pci_auto_config(struct pci_dev *pcidev, /* pci slot */ options[1] = PCI_SLOT(pcidev->devfn); - return comedi_auto_config(&pcidev->dev, driver, - options, ARRAY_SIZE(options)); + return comedi_old_auto_config(&pcidev->dev, driver, + options, ARRAY_SIZE(options)); } static int comedi_pci_attach_wrapper(struct comedi_device *dev, @@ -1049,7 +1049,7 @@ EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); static int comedi_old_usb_auto_config(struct usb_interface *intf, struct comedi_driver *driver) { - return comedi_auto_config(&intf->dev, driver, NULL, 0); + return comedi_old_auto_config(&intf->dev, driver, NULL, 0); } static int comedi_usb_attach_wrapper(struct comedi_device *dev,