evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: adl_pci9111: remove pci9111_8254_* i/o macros

Browse source 
These macros rely on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-09-10 18:51:30 -07:00 • committed by Greg Kroah-Hartman
parent 886edb0caf
commit d3ceb27c70
1 changed files with 24 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
drivers/staging/comedi/drivers/adl_pci9111.c
View file

@ -259,33 +259,6 @@ TODO:
#define pci9111_do_set_bits(bits) \ #define pci9111_do_set_bits(bits) \
outw(bits, dev->iobase + PCI9111_REGISTER_DIGITAL_IO) outw(bits, dev->iobase + PCI9111_REGISTER_DIGITAL_IO)
#define pci9111_8254_control_set(flags) \
outb(flags, dev->iobase + PCI9111_REGISTER_8254_CONTROL)
#define pci9111_8254_counter_0_set(data) \
do { \
outb(data & 0xFF, \
dev->iobase + PCI9111_REGISTER_8254_COUNTER_0); \
outb((data >> 8) & 0xFF, \
dev->iobase + PCI9111_REGISTER_8254_COUNTER_0); \
} while (0)
#define pci9111_8254_counter_1_set(data) \
do { \
outb(data & 0xFF, \
dev->iobase + PCI9111_REGISTER_8254_COUNTER_1); \
outb((data >> 8) & 0xFF, \
dev->iobase + PCI9111_REGISTER_8254_COUNTER_1); \
} while (0)
#define pci9111_8254_counter_2_set(data) \
do { \
outb(data & 0xFF, \
dev->iobase + PCI9111_REGISTER_8254_COUNTER_2); \
outb((data >> 8) & 0xFF, \
dev->iobase + PCI9111_REGISTER_8254_COUNTER_2); \
} while (0)
static const struct comedi_lrange pci9111_hr_ai_range = { static const struct comedi_lrange pci9111_hr_ai_range = {
5, 5,
{ {
@ -407,25 +380,35 @@ static void pci9111_timer_set(struct comedi_device *dev)
{ {
struct pci9111_private_data *dev_private = dev->private; struct pci9111_private_data *dev_private = dev->private;
pci9111_8254_control_set(PCI9111_8254_COUNTER_0 | outb(PCI9111_8254_COUNTER_0 |
PCI9111_8254_READ_LOAD_LSB_MSB | PCI9111_8254_READ_LOAD_LSB_MSB |
PCI9111_8254_MODE_0 | PCI9111_8254_MODE_0 |
PCI9111_8254_BINARY_COUNTER); PCI9111_8254_BINARY_COUNTER,
dev->iobase + PCI9111_REGISTER_8254_CONTROL);
pci9111_8254_control_set(PCI9111_8254_COUNTER_1 | outb(PCI9111_8254_COUNTER_1 |
PCI9111_8254_READ_LOAD_LSB_MSB | PCI9111_8254_READ_LOAD_LSB_MSB |
PCI9111_8254_MODE_2 | PCI9111_8254_MODE_2 |
PCI9111_8254_BINARY_COUNTER); PCI9111_8254_BINARY_COUNTER,
dev->iobase + PCI9111_REGISTER_8254_CONTROL);
pci9111_8254_control_set(PCI9111_8254_COUNTER_2 | outb(PCI9111_8254_COUNTER_2 |
PCI9111_8254_READ_LOAD_LSB_MSB | PCI9111_8254_READ_LOAD_LSB_MSB |
PCI9111_8254_MODE_2 | PCI9111_8254_MODE_2 |
PCI9111_8254_BINARY_COUNTER); PCI9111_8254_BINARY_COUNTER,
dev->iobase + PCI9111_REGISTER_8254_CONTROL);
udelay(1); udelay(1);
pci9111_8254_counter_2_set(dev_private->timer_divisor_2); outb(dev_private->timer_divisor_2 & 0xff,
pci9111_8254_counter_1_set(dev_private->timer_divisor_1); dev->iobase + PCI9111_REGISTER_8254_COUNTER_2);
outb((dev_private->timer_divisor_2 >> 8) & 0xff,
dev->iobase + PCI9111_REGISTER_8254_COUNTER_2);
outb(dev_private->timer_divisor_1 & 0xff,
dev->iobase + PCI9111_REGISTER_8254_COUNTER_1);
outb((dev_private->timer_divisor_1 >> 8) & 0xff,
dev->iobase + PCI9111_REGISTER_8254_COUNTER_1);
} }
enum pci9111_trigger_sources { enum pci9111_trigger_sources {