diff options
author | Wolfgang Grandegger <wg@grandegger.com> | 2011-11-23 18:08:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-29 18:28:55 -0500 |
commit | 115d2a3de2fd7d501369b0091c5c485a72ed90ed (patch) | |
tree | f105e25d86411043aa2d8309661e336131d0f719 /drivers/net/can/sja1000 | |
parent | 6977a79d36baf8b295b1893621874202e1d02094 (diff) |
can: sja1000_isa: fix "limited range" compiler warnings
This patch fixes the compiler warnings: "comparison is always
false due to limited range of data type" by using "0xff" instead
of "-1" for unsigned values.
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/sja1000')
-rw-r--r-- | drivers/net/can/sja1000/sja1000_isa.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c index 496223e9e2fc..f0840d55ab72 100644 --- a/drivers/net/can/sja1000/sja1000_isa.c +++ b/drivers/net/can/sja1000/sja1000_isa.c | |||
@@ -44,9 +44,9 @@ static unsigned long port[MAXDEV]; | |||
44 | static unsigned long mem[MAXDEV]; | 44 | static unsigned long mem[MAXDEV]; |
45 | static int __devinitdata irq[MAXDEV]; | 45 | static int __devinitdata irq[MAXDEV]; |
46 | static int __devinitdata clk[MAXDEV]; | 46 | static int __devinitdata clk[MAXDEV]; |
47 | static char __devinitdata cdr[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1}; | 47 | static unsigned char __devinitdata cdr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff}; |
48 | static char __devinitdata ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1}; | 48 | static unsigned char __devinitdata ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff}; |
49 | static char __devinitdata indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1}; | 49 | static int __devinitdata indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1}; |
50 | 50 | ||
51 | module_param_array(port, ulong, NULL, S_IRUGO); | 51 | module_param_array(port, ulong, NULL, S_IRUGO); |
52 | MODULE_PARM_DESC(port, "I/O port number"); | 52 | MODULE_PARM_DESC(port, "I/O port number"); |
@@ -54,7 +54,7 @@ MODULE_PARM_DESC(port, "I/O port number"); | |||
54 | module_param_array(mem, ulong, NULL, S_IRUGO); | 54 | module_param_array(mem, ulong, NULL, S_IRUGO); |
55 | MODULE_PARM_DESC(mem, "I/O memory address"); | 55 | MODULE_PARM_DESC(mem, "I/O memory address"); |
56 | 56 | ||
57 | module_param_array(indirect, byte, NULL, S_IRUGO); | 57 | module_param_array(indirect, int, NULL, S_IRUGO); |
58 | MODULE_PARM_DESC(indirect, "Indirect access via address and data port"); | 58 | MODULE_PARM_DESC(indirect, "Indirect access via address and data port"); |
59 | 59 | ||
60 | module_param_array(irq, int, NULL, S_IRUGO); | 60 | module_param_array(irq, int, NULL, S_IRUGO); |
@@ -189,17 +189,17 @@ static int __devinit sja1000_isa_probe(struct device *pdev, unsigned int idx) | |||
189 | else | 189 | else |
190 | priv->can.clock.freq = CLK_DEFAULT / 2; | 190 | priv->can.clock.freq = CLK_DEFAULT / 2; |
191 | 191 | ||
192 | if (ocr[idx] != -1) | 192 | if (ocr[idx] != 0xff) |
193 | priv->ocr = ocr[idx] & 0xff; | 193 | priv->ocr = ocr[idx]; |
194 | else if (ocr[0] != -1) | 194 | else if (ocr[0] != 0xff) |
195 | priv->ocr = ocr[0] & 0xff; | 195 | priv->ocr = ocr[0]; |
196 | else | 196 | else |
197 | priv->ocr = OCR_DEFAULT; | 197 | priv->ocr = OCR_DEFAULT; |
198 | 198 | ||
199 | if (cdr[idx] != -1) | 199 | if (cdr[idx] != 0xff) |
200 | priv->cdr = cdr[idx] & 0xff; | 200 | priv->cdr = cdr[idx]; |
201 | else if (cdr[0] != -1) | 201 | else if (cdr[0] != 0xff) |
202 | priv->cdr = cdr[0] & 0xff; | 202 | priv->cdr = cdr[0]; |
203 | else | 203 | else |
204 | priv->cdr = CDR_DEFAULT; | 204 | priv->cdr = CDR_DEFAULT; |
205 | 205 | ||