diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-04 19:07:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 14:36:08 -0400 |
commit | f31d0008cef0df52d1a2662ef56a24bdd88b0105 (patch) | |
tree | a67522ec1418d6c58f3612e304a7aece15b1de90 | |
parent | d18c5906d0914d911a13d342ff61a6bca6aff597 (diff) |
Staging: comedi: cb_pcidas64.c: fix sparse warnings
This fixes a bunch of iomem and other sparse warnings.
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidas64.c | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 0d9e92e59f9..3443fc1b918 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c | |||
@@ -1101,9 +1101,9 @@ struct pcidas64_private { | |||
1101 | resource_size_t main_phys_iobase; | 1101 | resource_size_t main_phys_iobase; |
1102 | resource_size_t dio_counter_phys_iobase; | 1102 | resource_size_t dio_counter_phys_iobase; |
1103 | /* base addresses (ioremapped) */ | 1103 | /* base addresses (ioremapped) */ |
1104 | void *plx9080_iobase; | 1104 | void __iomem *plx9080_iobase; |
1105 | void *main_iobase; | 1105 | void __iomem *main_iobase; |
1106 | void *dio_counter_iobase; | 1106 | void __iomem *dio_counter_iobase; |
1107 | /* local address (used by dma controller) */ | 1107 | /* local address (used by dma controller) */ |
1108 | uint32_t local0_iobase; | 1108 | uint32_t local0_iobase; |
1109 | uint32_t local1_iobase; | 1109 | uint32_t local1_iobase; |
@@ -1183,8 +1183,8 @@ static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, | |||
1183 | static irqreturn_t handle_interrupt(int irq, void *d); | 1183 | static irqreturn_t handle_interrupt(int irq, void *d); |
1184 | static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); | 1184 | static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
1185 | static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s); | 1185 | static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
1186 | static int dio_callback(int dir, int port, int data, unsigned long arg); | 1186 | static int dio_callback(int dir, int port, int data, void __iomem *base); |
1187 | static int dio_callback_4020(int dir, int port, int data, unsigned long arg); | 1187 | static int dio_callback_4020(int dir, int port, int data, void __iomem *base); |
1188 | static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, | 1188 | static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
1189 | struct comedi_insn *insn, unsigned int *data); | 1189 | struct comedi_insn *insn, unsigned int *data); |
1190 | static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, | 1190 | static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
@@ -1316,7 +1316,7 @@ static inline int ao_cmd_is_supported(const struct pcidas64_board *board) | |||
1316 | static void init_plx9080(struct comedi_device *dev) | 1316 | static void init_plx9080(struct comedi_device *dev) |
1317 | { | 1317 | { |
1318 | uint32_t bits; | 1318 | uint32_t bits; |
1319 | void *plx_iobase = priv(dev)->plx9080_iobase; | 1319 | void __iomem *plx_iobase = priv(dev)->plx9080_iobase; |
1320 | 1320 | ||
1321 | priv(dev)->plx_control_bits = | 1321 | priv(dev)->plx_control_bits = |
1322 | readl(priv(dev)->plx9080_iobase + PLX_CONTROL_REG); | 1322 | readl(priv(dev)->plx9080_iobase + PLX_CONTROL_REG); |
@@ -1406,7 +1406,7 @@ static void init_plx9080(struct comedi_device *dev) | |||
1406 | static int setup_subdevices(struct comedi_device *dev) | 1406 | static int setup_subdevices(struct comedi_device *dev) |
1407 | { | 1407 | { |
1408 | struct comedi_subdevice *s; | 1408 | struct comedi_subdevice *s; |
1409 | void *dio_8255_iobase; | 1409 | void __iomem *dio_8255_iobase; |
1410 | int i; | 1410 | int i; |
1411 | 1411 | ||
1412 | if (alloc_subdevices(dev, 10) < 0) | 1412 | if (alloc_subdevices(dev, 10) < 0) |
@@ -1432,7 +1432,6 @@ static int setup_subdevices(struct comedi_device *dev) | |||
1432 | s->do_cmdtest = ai_cmdtest; | 1432 | s->do_cmdtest = ai_cmdtest; |
1433 | s->cancel = ai_cancel; | 1433 | s->cancel = ai_cancel; |
1434 | if (board(dev)->layout == LAYOUT_4020) { | 1434 | if (board(dev)->layout == LAYOUT_4020) { |
1435 | unsigned int i; | ||
1436 | uint8_t data; | 1435 | uint8_t data; |
1437 | /* set adc to read from inputs (not internal calibration sources) */ | 1436 | /* set adc to read from inputs (not internal calibration sources) */ |
1438 | priv(dev)->i2c_cal_range_bits = adc_src_4020_bits(4); | 1437 | priv(dev)->i2c_cal_range_bits = adc_src_4020_bits(4); |
@@ -1614,7 +1613,7 @@ static void init_stc_registers(struct comedi_device *dev) | |||
1614 | disable_ai_pacing(dev); | 1613 | disable_ai_pacing(dev); |
1615 | }; | 1614 | }; |
1616 | 1615 | ||
1617 | int alloc_and_init_dma_members(struct comedi_device *dev) | 1616 | static int alloc_and_init_dma_members(struct comedi_device *dev) |
1618 | { | 1617 | { |
1619 | int i; | 1618 | int i; |
1620 | 1619 | ||
@@ -1877,12 +1876,12 @@ static int detach(struct comedi_device *dev) | |||
1877 | if (priv(dev)->hw_dev) { | 1876 | if (priv(dev)->hw_dev) { |
1878 | if (priv(dev)->plx9080_iobase) { | 1877 | if (priv(dev)->plx9080_iobase) { |
1879 | disable_plx_interrupts(dev); | 1878 | disable_plx_interrupts(dev); |
1880 | iounmap((void *)priv(dev)->plx9080_iobase); | 1879 | iounmap(priv(dev)->plx9080_iobase); |
1881 | } | 1880 | } |
1882 | if (priv(dev)->main_iobase) | 1881 | if (priv(dev)->main_iobase) |
1883 | iounmap((void *)priv(dev)->main_iobase); | 1882 | iounmap(priv(dev)->main_iobase); |
1884 | if (priv(dev)->dio_counter_iobase) | 1883 | if (priv(dev)->dio_counter_iobase) |
1885 | iounmap((void *)priv(dev)->dio_counter_iobase); | 1884 | iounmap(priv(dev)->dio_counter_iobase); |
1886 | /* free pci dma buffers */ | 1885 | /* free pci dma buffers */ |
1887 | for (i = 0; i < ai_dma_ring_count(board(dev)); i++) { | 1886 | for (i = 0; i < ai_dma_ring_count(board(dev)); i++) { |
1888 | if (priv(dev)->ai_buffer[i]) | 1887 | if (priv(dev)->ai_buffer[i]) |
@@ -2978,7 +2977,7 @@ static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel) | |||
2978 | uint32_t next_transfer_addr; | 2977 | uint32_t next_transfer_addr; |
2979 | int j; | 2978 | int j; |
2980 | int num_samples = 0; | 2979 | int num_samples = 0; |
2981 | void *pci_addr_reg; | 2980 | void __iomem *pci_addr_reg; |
2982 | 2981 | ||
2983 | if (channel) | 2982 | if (channel) |
2984 | pci_addr_reg = | 2983 | pci_addr_reg = |
@@ -3018,8 +3017,9 @@ static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel) | |||
3018 | * unused buffer) */ | 3017 | * unused buffer) */ |
3019 | } | 3018 | } |
3020 | 3019 | ||
3021 | void handle_ai_interrupt(struct comedi_device *dev, unsigned short status, | 3020 | static void handle_ai_interrupt(struct comedi_device *dev, |
3022 | unsigned int plx_status) | 3021 | unsigned short status, |
3022 | unsigned int plx_status) | ||
3023 | { | 3023 | { |
3024 | struct comedi_subdevice *s = dev->read_subdev; | 3024 | struct comedi_subdevice *s = dev->read_subdev; |
3025 | struct comedi_async *async = s->async; | 3025 | struct comedi_async *async = s->async; |
@@ -3229,7 +3229,7 @@ static irqreturn_t handle_interrupt(int irq, void *d) | |||
3229 | return IRQ_HANDLED; | 3229 | return IRQ_HANDLED; |
3230 | } | 3230 | } |
3231 | 3231 | ||
3232 | void abort_dma(struct comedi_device *dev, unsigned int channel) | 3232 | static void abort_dma(struct comedi_device *dev, unsigned int channel) |
3233 | { | 3233 | { |
3234 | unsigned long flags; | 3234 | unsigned long flags; |
3235 | 3235 | ||
@@ -3424,7 +3424,7 @@ static void load_ao_dma(struct comedi_device *dev, const struct comedi_cmd *cmd) | |||
3424 | { | 3424 | { |
3425 | unsigned int num_bytes; | 3425 | unsigned int num_bytes; |
3426 | unsigned int next_transfer_addr; | 3426 | unsigned int next_transfer_addr; |
3427 | void *pci_addr_reg = | 3427 | void __iomem *pci_addr_reg = |
3428 | priv(dev)->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG; | 3428 | priv(dev)->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG; |
3429 | unsigned int buffer_index; | 3429 | unsigned int buffer_index; |
3430 | 3430 | ||
@@ -3658,24 +3658,24 @@ static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s) | |||
3658 | return 0; | 3658 | return 0; |
3659 | } | 3659 | } |
3660 | 3660 | ||
3661 | static int dio_callback(int dir, int port, int data, unsigned long iobase) | 3661 | static int dio_callback(int dir, int port, int data, void __iomem *iobase) |
3662 | { | 3662 | { |
3663 | if (dir) { | 3663 | if (dir) { |
3664 | writeb(data, (void *)(iobase + port)); | 3664 | writeb(data, iobase + port); |
3665 | DEBUG_PRINT("wrote 0x%x to port %i\n", data, port); | 3665 | DEBUG_PRINT("wrote 0x%x to port %i\n", data, port); |
3666 | return 0; | 3666 | return 0; |
3667 | } else { | 3667 | } else { |
3668 | return readb((void *)(iobase + port)); | 3668 | return readb(iobase + port); |
3669 | } | 3669 | } |
3670 | } | 3670 | } |
3671 | 3671 | ||
3672 | static int dio_callback_4020(int dir, int port, int data, unsigned long iobase) | 3672 | static int dio_callback_4020(int dir, int port, int data, void __iomem *iobase) |
3673 | { | 3673 | { |
3674 | if (dir) { | 3674 | if (dir) { |
3675 | writew(data, (void *)(iobase + 2 * port)); | 3675 | writew(data, iobase + 2 * port); |
3676 | return 0; | 3676 | return 0; |
3677 | } else { | 3677 | } else { |
3678 | return readw((void *)(iobase + 2 * port)); | 3678 | return readw(iobase + 2 * port); |
3679 | } | 3679 | } |
3680 | } | 3680 | } |
3681 | 3681 | ||
@@ -3862,7 +3862,7 @@ static uint16_t read_eeprom(struct comedi_device *dev, uint8_t address) | |||
3862 | static const int read_command = 0x6; | 3862 | static const int read_command = 0x6; |
3863 | unsigned int bitstream = (read_command << 8) | address; | 3863 | unsigned int bitstream = (read_command << 8) | address; |
3864 | unsigned int bit; | 3864 | unsigned int bit; |
3865 | void *const plx_control_addr = | 3865 | void __iomem * const plx_control_addr = |
3866 | priv(dev)->plx9080_iobase + PLX_CONTROL_REG; | 3866 | priv(dev)->plx9080_iobase + PLX_CONTROL_REG; |
3867 | uint16_t value; | 3867 | uint16_t value; |
3868 | static const int value_length = 16; | 3868 | static const int value_length = 16; |
@@ -4185,7 +4185,8 @@ static const int i2c_low_udelay = 10; | |||
4185 | static void i2c_set_sda(struct comedi_device *dev, int state) | 4185 | static void i2c_set_sda(struct comedi_device *dev, int state) |
4186 | { | 4186 | { |
4187 | static const int data_bit = CTL_EE_W; | 4187 | static const int data_bit = CTL_EE_W; |
4188 | void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG; | 4188 | void __iomem *plx_control_addr = priv(dev)->plx9080_iobase + |
4189 | PLX_CONTROL_REG; | ||
4189 | 4190 | ||
4190 | if (state) { | 4191 | if (state) { |
4191 | /* set data line high */ | 4192 | /* set data line high */ |
@@ -4204,7 +4205,8 @@ static void i2c_set_sda(struct comedi_device *dev, int state) | |||
4204 | static void i2c_set_scl(struct comedi_device *dev, int state) | 4205 | static void i2c_set_scl(struct comedi_device *dev, int state) |
4205 | { | 4206 | { |
4206 | static const int clock_bit = CTL_USERO; | 4207 | static const int clock_bit = CTL_USERO; |
4207 | void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG; | 4208 | void __iomem *plx_control_addr = priv(dev)->plx9080_iobase + |
4209 | PLX_CONTROL_REG; | ||
4208 | 4210 | ||
4209 | if (state) { | 4211 | if (state) { |
4210 | /* set clock line high */ | 4212 | /* set clock line high */ |