Merge tag 'regulator-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / drivers / staging / comedi / drivers / adl_pci9111.c

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index 89ca5078e8b36809a70903d369f0f2226ec1bef8..eab8da2c3d66910b23ef26cc5fceac488843a114 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -86,8 +86,6 @@ TODO:
 #define PCI9111_AI_INSTANT_READ_UDELAY_US      2
 #define PCI9111_AI_INSTANT_READ_TIMEOUT                100
 
-#define PCI9111_8254_CLOCK_PERIOD_NS           500
-
 /*
  * IO address map and bit defines
  */
@@ -153,7 +151,7 @@ struct pci9111_private_data {
        unsigned int div1;
        unsigned int div2;
 
-       short ai_bounce_buffer[2 * PCI9111_FIFO_HALF_SIZE];
+       unsigned short ai_bounce_buffer[2 * PCI9111_FIFO_HALF_SIZE];
 };
 
 static void plx9050_interrupt_control(unsigned long io_base,
@@ -393,11 +391,10 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev,
 
        if (cmd->convert_src == TRIG_TIMER) {
                tmp = cmd->convert_arg;
-               i8253_cascade_ns_to_timer_2div(PCI9111_8254_CLOCK_PERIOD_NS,
-                                              &dev_private->div1,
-                                              &dev_private->div2,
-                                              &cmd->convert_arg,
-                                              cmd->flags & TRIG_ROUND_MASK);
+               i8253_cascade_ns_to_timer(I8254_OSC_BASE_2MHZ,
+                                         &dev_private->div1,
+                                         &dev_private->div2,
+                                         &cmd->convert_arg, cmd->flags);
                if (tmp != cmd->convert_arg)
                        error++;
        }
@@ -570,7 +567,7 @@ static void pci9111_ai_munge(struct comedi_device *dev,
                             unsigned int num_bytes,
                             unsigned int start_chan_index)
 {
-       short *array = data;
+       unsigned short *array = data;
        unsigned int maxdata = s->maxdata;
        unsigned int invert = (maxdata + 1) >> 1;
        unsigned int shift = (maxdata == 0xffff) ? 0 : 4;