From: H Hartley Sweeten Date: Tue, 18 Jun 2013 20:21:13 +0000 (-0700) Subject: staging: comedi: pcmuio: tidy up switch_page() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=46317da71ee85dccc351735e8b463123f4d448a3;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: pcmuio: tidy up switch_page() All the I/O ports are left unlocked in the driver so the 'pagelock' in the private data is not necessary. The paranoia sanity checks are also unnecessary, Remove them. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index 9fb75a47fb77..3c98a00998b0 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c @@ -182,8 +182,6 @@ struct pcmuio_subdev_private { struct pcmuio_private { struct { - /* current page and lock */ - unsigned char pagelock; /* shadow of POLx registers */ unsigned char pol[NUM_PAGED_REGS]; /* shadow of ENABx registers */ @@ -312,19 +310,7 @@ static int pcmuio_dio_insn_config(struct comedi_device *dev, static void switch_page(struct comedi_device *dev, int asic, int page) { - const struct pcmuio_board *board = comedi_board(dev); - struct pcmuio_private *devpriv = dev->private; - - if (asic < 0 || asic >= board->num_asics) - return; /* paranoia */ - if (page < 0 || page >= NUM_PAGES) - return; /* more paranoia */ - - devpriv->asics[asic].pagelock &= ~PCMUIO_PAGE_MASK; - devpriv->asics[asic].pagelock |= PCMUIO_PAGE(page); - - /* now write out the shadow register */ - outb(devpriv->asics[asic].pagelock, + outb(PCMUIO_PAGE(page), dev->iobase + ASIC_IOSIZE * asic + PCMUIO_PAGE_LOCK_REG); }