summaryrefslogtreecommitdiff
path: root/drivers/net/can/c_can/c_can.h
diff options
context:
space:
mode:
authorWolfram Sang <wsa@sang-engineering.com>2014-04-17 10:57:18 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2014-04-24 22:09:01 +0200
commitf323d7a1d2868c00b2604dca36ad82e8ecbe4270 (patch)
treed4db44e61e0d6a6197e47aa74b567f9b034d7608 /drivers/net/can/c_can/c_can.h
parent939415973fdfb2c16a474e2575ba2581b828ccac (diff)
can: c_can: use proper type for 'instance'
Commit 6439fbce1075 (can: c_can: fix error checking of priv->instance in probe()) found the warning but applied a suboptimal solution. Since, both pdev->id and of_alias_get_id() return integers, it makes sense to convert the variable to an integer and avoid the cast. Signed-off-by: Wolfram Sang <wsa@sang-engineering.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/c_can/c_can.h')
-rw-r--r--drivers/net/can/c_can/c_can.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index e7de2b9f26bb..c56f1b1c11ca 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -183,7 +183,7 @@ struct c_can_priv {
void *priv; /* for board-specific data */
enum c_can_dev_id type;
u32 __iomem *raminit_ctrlreg;
- unsigned int instance;
+ int instance;
void (*raminit) (const struct c_can_priv *priv, bool enable);
u32 comm_rcv_high;
u32 rxmasked;