From: H Hartley Sweeten Date: Tue, 12 Aug 2014 18:41:18 +0000 (-0700) Subject: staging: comedi: amplc_pci230: refactor iobase addresses X-Git-Tag: fixes-for-v3.18-merge-window~15^2~1220 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f9c63fe5333b27ab23ed399830c7977f6970744;p=pandora-kernel.git staging: comedi: amplc_pci230: refactor iobase addresses This driver uses two iobase addresses, found in PCI bars 2 and 3. Currently, the address in PCI bar 2 is saved in the private data as 'iobase1' and the address in PCI bar 3 is saved in the comedi_device as the 'iobase'. The 'iobase' is the base address of the daq registers (ai/ao) of the board. The 'iobase1' address is the base address of the 8255, 8254, configuration, and interrupt registers. Flip the saving of these base addresses. Save the address from PCI bar 2 in the comedi_device 'iobase' and the address from PCI bar 3 in the private data as 'daqio'. This will help with some cleanup of the 8255 module. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed