diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-27 14:44:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 11:00:33 -0700 |
| commit | 5f74ea14c07fee91d3bdbaad88bff6264c6200e6 (patch) | |
| tree | ad077b6cac71be4ec8f0f136bd7b2473718e65e7 /drivers/staging/comedi/drivers/adv_pci_dio.c | |
| parent | 81874ff7895f332920621104308e803434a17183 (diff) | |
| download | kernel_samsung_smdk4412-5f74ea14c07fee91d3bdbaad88bff6264c6200e6.zip kernel_samsung_smdk4412-5f74ea14c07fee91d3bdbaad88bff6264c6200e6.tar.gz kernel_samsung_smdk4412-5f74ea14c07fee91d3bdbaad88bff6264c6200e6.tar.bz2 | |
Staging: comedi: remove comedi-specific wrappers
There are a number of comedi "wrappers" for some RT functions that are
about to go away. This patch removes all of the wrapper calls within
the comedi drivers and core in order to prepare for removing the RT
comedi code.
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/adv_pci_dio.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/adv_pci_dio.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c index 7d66f2b..5a8c0a3 100644 --- a/drivers/staging/comedi/drivers/adv_pci_dio.c +++ b/drivers/staging/comedi/drivers/adv_pci_dio.c @@ -40,7 +40,7 @@ Configuration options: #undef DPRINTK #ifdef PCI_DIO_EXTDEBUG -#define DPRINTK(fmt, args...) rt_printk(fmt, ## args) +#define DPRINTK(fmt, args...) printk(fmt, ## args) #else #define DPRINTK(fmt, args...) #endif @@ -451,7 +451,7 @@ static int pci1760_unchecked_mbxrequest(struct comedi_device *dev, ok = 1; break; } - comedi_udelay(1); + udelay(1); } if (ok) return 0; @@ -896,11 +896,11 @@ static int pci_dio_attach(struct comedi_device *dev, struct comedi_devconfig *it unsigned long iobase; struct pci_dev *pcidev; - rt_printk("comedi%d: adv_pci_dio: ", dev->minor); + printk("comedi%d: adv_pci_dio: ", dev->minor); ret = alloc_private(dev, sizeof(struct pci_dio_private)); if (ret < 0) { - rt_printk(", Error: Cann't allocate private memory!\n"); + printk(", Error: Cann't allocate private memory!\n"); return -ENOMEM; } @@ -932,18 +932,18 @@ static int pci_dio_attach(struct comedi_device *dev, struct comedi_devconfig *it } if (!dev->board_ptr) { - rt_printk + printk (", Error: Requested type of the card was not found!\n"); return -EIO; } if (comedi_pci_enable(pcidev, driver_pci_dio.driver_name)) { - rt_printk + printk (", Error: Can't enable PCI device and request regions!\n"); return -EIO; } iobase = pci_resource_start(pcidev, this_board->main_pci_region); - rt_printk(", b:s:f=%d:%d:%d, io=0x%4lx", + printk(", b:s:f=%d:%d:%d, io=0x%4lx", pcidev->bus->number, PCI_SLOT(pcidev->devfn), PCI_FUNC(pcidev->devfn), iobase); @@ -968,11 +968,11 @@ static int pci_dio_attach(struct comedi_device *dev, struct comedi_devconfig *it ret = alloc_subdevices(dev, n_subdevices); if (ret < 0) { - rt_printk(", Error: Cann't allocate subdevice memory!\n"); + printk(", Error: Cann't allocate subdevice memory!\n"); return ret; } - rt_printk(".\n"); + printk(".\n"); subdev = 0; |