Staging: comedi: remove comedi-specific wrappers

[mirror_ubuntu-hirsute-kernel.git] / drivers / staging / comedi / drivers / jr3_pci.c

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index d1f3bae15524e05ca3287d9996b8b6437dd1bc3e..baf83c6a9412418be67392cb9dfc4a4425e26143 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -185,10 +185,10 @@ static void set_transforms(volatile struct jr3_channel *channel,
 
                set_u16(&channel->transforms[num].link[i].link_type,
                        transf.link[i].link_type);
-               comedi_udelay(1);
+               udelay(1);
                set_s16(&channel->transforms[num].link[i].link_amount,
                        transf.link[i].link_amount);
-               comedi_udelay(1);
+               udelay(1);
                if (transf.link[i].link_type == end_x_form) {
                        break;
                }
@@ -496,12 +496,12 @@ static int jr3_download_firmware(struct comedi_device *dev, const u8 *data,
                                                                channel[i].
                                                                program_low
                                                                [addr], data1);
-                                                       comedi_udelay(1);
+                                                       udelay(1);
                                                        set_u16(&p->iobase->
                                                                channel[i].
                                                                program_high
                                                                [addr], data2);
-                                                       comedi_udelay(1);
+                                                       udelay(1);
 
                                                }
                                        }
@@ -734,7 +734,7 @@ static void jr3_pci_poll_dev(unsigned long data)
        int delay;
        int i;
 
-       comedi_spin_lock_irqsave(&dev->spinlock, flags);
+       spin_lock_irqsave(&dev->spinlock, flags);
        delay = 1000;
        now = jiffies;
        /*  Poll all channels that are ready to be polled */
@@ -757,7 +757,7 @@ static void jr3_pci_poll_dev(unsigned long data)
                        }
                }
        }
-       comedi_spin_unlock_irqrestore(&dev->spinlock, flags);
+       spin_unlock_irqrestore(&dev->spinlock, flags);
 
        devpriv->timer.expires = jiffies + msecs_to_jiffies(delay);
        add_timer(&devpriv->timer);
@@ -873,7 +873,7 @@ static int jr3_pci_attach(struct comedi_device *dev, struct comedi_devconfig *it
                                p->range[j].range.max = 1000000;
                                for (k = 0; k < 7; k++) {
                                        p->range_table_list[j + k * 8] =
-                                               (struct comedi_lrange *) & p->range[j];
+                                               (struct comedi_lrange *) &p->range[j];
                                        p->maxdata_list[j + k * 8] = 0x7fff;
                                }
                        }
@@ -882,9 +882,9 @@ static int jr3_pci_attach(struct comedi_device *dev, struct comedi_devconfig *it
                        p->range[8].range.max = 65536;
 
                        p->range_table_list[56] =
-                               (struct comedi_lrange *) & p->range[8];
+                               (struct comedi_lrange *) &p->range[8];
                        p->range_table_list[57] =
-                               (struct comedi_lrange *) & p->range[8];
+                               (struct comedi_lrange *) &p->range[8];
                        p->maxdata_list[56] = 0xffff;
                        p->maxdata_list[57] = 0xffff;
                        /*  Channel specific range and maxdata */