Commit 8657fed8 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: pcmmio: remove 'asic' parameter from switch_page()

The board supported by this driver only has one WinSystems WS16C48 asic
on it that handles the digital i/o.

Remove the unnecessary 'asic' parameter that is passed to switch_page().
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d65bd16d
...@@ -363,7 +363,7 @@ static int pcmmio_dio_insn_config(struct comedi_device *dev, ...@@ -363,7 +363,7 @@ static int pcmmio_dio_insn_config(struct comedi_device *dev,
return insn->n; return insn->n;
} }
static void switch_page(struct comedi_device *dev, int asic, int page) static void switch_page(struct comedi_device *dev, int page)
{ {
struct pcmmio_private *devpriv = dev->private; struct pcmmio_private *devpriv = dev->private;
...@@ -380,7 +380,7 @@ static void init_asics(struct comedi_device *dev) ...@@ -380,7 +380,7 @@ static void init_asics(struct comedi_device *dev)
int port, page; int port, page;
unsigned long baseaddr = devpriv->asic_iobase; unsigned long baseaddr = devpriv->asic_iobase;
switch_page(dev, asic, 0); /* switch back to page 0 */ switch_page(dev, 0); /* switch back to page 0 */
/* first, clear all the DIO port bits */ /* first, clear all the DIO port bits */
for (port = 0; port < PORTS_PER_ASIC; ++port) for (port = 0; port < PORTS_PER_ASIC; ++port)
...@@ -390,14 +390,14 @@ static void init_asics(struct comedi_device *dev) ...@@ -390,14 +390,14 @@ static void init_asics(struct comedi_device *dev)
for (page = 1; page < NUM_PAGES; ++page) { for (page = 1; page < NUM_PAGES; ++page) {
int reg; int reg;
/* now clear all the paged registers */ /* now clear all the paged registers */
switch_page(dev, asic, page); switch_page(dev, page);
for (reg = FIRST_PAGED_REG; for (reg = FIRST_PAGED_REG;
reg < FIRST_PAGED_REG + NUM_PAGED_REGS; ++reg) reg < FIRST_PAGED_REG + NUM_PAGED_REGS; ++reg)
outb(0, baseaddr + reg); outb(0, baseaddr + reg);
} }
/* switch back to default page 0 */ /* switch back to default page 0 */
switch_page(dev, asic, 0); switch_page(dev, 0);
} }
} }
...@@ -416,7 +416,7 @@ static void pcmmio_stop_intr(struct comedi_device *dev, ...@@ -416,7 +416,7 @@ static void pcmmio_stop_intr(struct comedi_device *dev,
s->async->inttrig = NULL; s->async->inttrig = NULL;
nports = subpriv->dio.intr.num_asic_chans / CHANS_PER_PORT; nports = subpriv->dio.intr.num_asic_chans / CHANS_PER_PORT;
firstport = subpriv->dio.intr.asic_chan / CHANS_PER_PORT; firstport = subpriv->dio.intr.asic_chan / CHANS_PER_PORT;
switch_page(dev, asic, PAGE_ENAB); switch_page(dev, PAGE_ENAB);
for (port = firstport; port < firstport + nports; ++port) { for (port = firstport; port < firstport + nports; ++port) {
/* disable all intrs for this subdev.. */ /* disable all intrs for this subdev.. */
outb(0, devpriv->asic_iobase + REG_ENAB0 + port); outb(0, devpriv->asic_iobase + REG_ENAB0 + port);
...@@ -449,8 +449,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d) ...@@ -449,8 +449,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
if (int_pend & (0x1 << port)) { if (int_pend & (0x1 << port)) {
unsigned char unsigned char
io_lines_with_edges = 0; io_lines_with_edges = 0;
switch_page(dev, asic, switch_page(dev, PAGE_INT_ID);
PAGE_INT_ID);
io_lines_with_edges = io_lines_with_edges =
inb(iobase + inb(iobase +
REG_INT_ID0 + port); REG_INT_ID0 + port);
...@@ -634,7 +633,7 @@ static int pcmmio_start_intr(struct comedi_device *dev, ...@@ -634,7 +633,7 @@ static int pcmmio_start_intr(struct comedi_device *dev,
/* done, we told the board what irq to use */ /* done, we told the board what irq to use */
} }
switch_page(dev, asic, PAGE_ENAB); switch_page(dev, PAGE_ENAB);
for (port = firstport; port < firstport + nports; ++port) { for (port = firstport; port < firstport + nports; ++port) {
unsigned enab = unsigned enab =
bits >> (subpriv->dio.intr.first_chan + (port - bits >> (subpriv->dio.intr.first_chan + (port -
...@@ -644,7 +643,7 @@ static int pcmmio_start_intr(struct comedi_device *dev, ...@@ -644,7 +643,7 @@ static int pcmmio_start_intr(struct comedi_device *dev,
(port - firstport) * 8) & 0xff; (port - firstport) * 8) & 0xff;
/* set enab intrs for this subdev.. */ /* set enab intrs for this subdev.. */
outb(enab, devpriv->asic_iobase + REG_ENAB0 + port); outb(enab, devpriv->asic_iobase + REG_ENAB0 + port);
switch_page(dev, asic, PAGE_POL); switch_page(dev, PAGE_POL);
outb(pol, devpriv->asic_iobase + REG_ENAB0 + port); outb(pol, devpriv->asic_iobase + REG_ENAB0 + port);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment