From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 12 Aug 2014 18:41:16 +0000 (-0700)
Subject: staging: comedi: cb_pcimdas: refactor iobase addresses
X-Git-Tag: fixes-for-v3.18-merge-window~15^2~1222
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49fca95c403c01d2a91119fa64b86d4291324d17;p=pandora-kernel.git

staging: comedi: cb_pcimdas: refactor iobase addresses

This driver uses three iobase addresses, found in PCI bars 2, 3, and 4.
Currently, the address in PCI bar 2 is saved in the comedi_device as
the 'iobase', the PCI bar 3 address is saved in the private data as
'BADR3' and the one in PCI bar 4 is just passed to subdev_8255_init()
as the 'iobase' parameter.

Flip the saving of the PCI bar 2 and 4 base addresses. Save the address
from PCI bar 2 in the private data as the 'daqio' and the address from
PCI bar 4 in the comedi_device as the 'iobase'.

This will help with some cleanup of the 8255 module.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed