diff options
Diffstat (limited to 'drivers/net/can/mcp251x.c')
-rw-r--r-- | drivers/net/can/mcp251x.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c index 2b620c8aa13a..3444e9ee4a80 100644 --- a/drivers/net/can/mcp251x.c +++ b/drivers/net/can/mcp251x.c | |||
@@ -269,7 +269,7 @@ struct mcp251x_priv { | |||
269 | #define MCP251X_IS(_model) \ | 269 | #define MCP251X_IS(_model) \ |
270 | static inline int mcp251x_is_##_model(struct spi_device *spi) \ | 270 | static inline int mcp251x_is_##_model(struct spi_device *spi) \ |
271 | { \ | 271 | { \ |
272 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); \ | 272 | struct mcp251x_priv *priv = spi_get_drvdata(spi); \ |
273 | return priv->model == CAN_MCP251X_MCP##_model; \ | 273 | return priv->model == CAN_MCP251X_MCP##_model; \ |
274 | } | 274 | } |
275 | 275 | ||
@@ -305,7 +305,7 @@ static void mcp251x_clean(struct net_device *net) | |||
305 | */ | 305 | */ |
306 | static int mcp251x_spi_trans(struct spi_device *spi, int len) | 306 | static int mcp251x_spi_trans(struct spi_device *spi, int len) |
307 | { | 307 | { |
308 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 308 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
309 | struct spi_transfer t = { | 309 | struct spi_transfer t = { |
310 | .tx_buf = priv->spi_tx_buf, | 310 | .tx_buf = priv->spi_tx_buf, |
311 | .rx_buf = priv->spi_rx_buf, | 311 | .rx_buf = priv->spi_rx_buf, |
@@ -333,7 +333,7 @@ static int mcp251x_spi_trans(struct spi_device *spi, int len) | |||
333 | 333 | ||
334 | static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg) | 334 | static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg) |
335 | { | 335 | { |
336 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 336 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
337 | u8 val = 0; | 337 | u8 val = 0; |
338 | 338 | ||
339 | priv->spi_tx_buf[0] = INSTRUCTION_READ; | 339 | priv->spi_tx_buf[0] = INSTRUCTION_READ; |
@@ -348,7 +348,7 @@ static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg) | |||
348 | static void mcp251x_read_2regs(struct spi_device *spi, uint8_t reg, | 348 | static void mcp251x_read_2regs(struct spi_device *spi, uint8_t reg, |
349 | uint8_t *v1, uint8_t *v2) | 349 | uint8_t *v1, uint8_t *v2) |
350 | { | 350 | { |
351 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 351 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
352 | 352 | ||
353 | priv->spi_tx_buf[0] = INSTRUCTION_READ; | 353 | priv->spi_tx_buf[0] = INSTRUCTION_READ; |
354 | priv->spi_tx_buf[1] = reg; | 354 | priv->spi_tx_buf[1] = reg; |
@@ -361,7 +361,7 @@ static void mcp251x_read_2regs(struct spi_device *spi, uint8_t reg, | |||
361 | 361 | ||
362 | static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val) | 362 | static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val) |
363 | { | 363 | { |
364 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 364 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
365 | 365 | ||
366 | priv->spi_tx_buf[0] = INSTRUCTION_WRITE; | 366 | priv->spi_tx_buf[0] = INSTRUCTION_WRITE; |
367 | priv->spi_tx_buf[1] = reg; | 367 | priv->spi_tx_buf[1] = reg; |
@@ -373,7 +373,7 @@ static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val) | |||
373 | static void mcp251x_write_bits(struct spi_device *spi, u8 reg, | 373 | static void mcp251x_write_bits(struct spi_device *spi, u8 reg, |
374 | u8 mask, uint8_t val) | 374 | u8 mask, uint8_t val) |
375 | { | 375 | { |
376 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 376 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
377 | 377 | ||
378 | priv->spi_tx_buf[0] = INSTRUCTION_BIT_MODIFY; | 378 | priv->spi_tx_buf[0] = INSTRUCTION_BIT_MODIFY; |
379 | priv->spi_tx_buf[1] = reg; | 379 | priv->spi_tx_buf[1] = reg; |
@@ -386,7 +386,7 @@ static void mcp251x_write_bits(struct spi_device *spi, u8 reg, | |||
386 | static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf, | 386 | static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf, |
387 | int len, int tx_buf_idx) | 387 | int len, int tx_buf_idx) |
388 | { | 388 | { |
389 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 389 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
390 | 390 | ||
391 | if (mcp251x_is_2510(spi)) { | 391 | if (mcp251x_is_2510(spi)) { |
392 | int i; | 392 | int i; |
@@ -403,7 +403,7 @@ static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf, | |||
403 | static void mcp251x_hw_tx(struct spi_device *spi, struct can_frame *frame, | 403 | static void mcp251x_hw_tx(struct spi_device *spi, struct can_frame *frame, |
404 | int tx_buf_idx) | 404 | int tx_buf_idx) |
405 | { | 405 | { |
406 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 406 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
407 | u32 sid, eid, exide, rtr; | 407 | u32 sid, eid, exide, rtr; |
408 | u8 buf[SPI_TRANSFER_BUF_LEN]; | 408 | u8 buf[SPI_TRANSFER_BUF_LEN]; |
409 | 409 | ||
@@ -434,7 +434,7 @@ static void mcp251x_hw_tx(struct spi_device *spi, struct can_frame *frame, | |||
434 | static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf, | 434 | static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf, |
435 | int buf_idx) | 435 | int buf_idx) |
436 | { | 436 | { |
437 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 437 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
438 | 438 | ||
439 | if (mcp251x_is_2510(spi)) { | 439 | if (mcp251x_is_2510(spi)) { |
440 | int i, len; | 440 | int i, len; |
@@ -454,7 +454,7 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf, | |||
454 | 454 | ||
455 | static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx) | 455 | static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx) |
456 | { | 456 | { |
457 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 457 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
458 | struct sk_buff *skb; | 458 | struct sk_buff *skb; |
459 | struct can_frame *frame; | 459 | struct can_frame *frame; |
460 | u8 buf[SPI_TRANSFER_BUF_LEN]; | 460 | u8 buf[SPI_TRANSFER_BUF_LEN]; |
@@ -550,7 +550,7 @@ static int mcp251x_do_set_mode(struct net_device *net, enum can_mode mode) | |||
550 | 550 | ||
551 | static int mcp251x_set_normal_mode(struct spi_device *spi) | 551 | static int mcp251x_set_normal_mode(struct spi_device *spi) |
552 | { | 552 | { |
553 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 553 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
554 | unsigned long timeout; | 554 | unsigned long timeout; |
555 | 555 | ||
556 | /* Enable interrupts */ | 556 | /* Enable interrupts */ |
@@ -620,7 +620,7 @@ static int mcp251x_setup(struct net_device *net, struct mcp251x_priv *priv, | |||
620 | 620 | ||
621 | static int mcp251x_hw_reset(struct spi_device *spi) | 621 | static int mcp251x_hw_reset(struct spi_device *spi) |
622 | { | 622 | { |
623 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 623 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
624 | int ret; | 624 | int ret; |
625 | unsigned long timeout; | 625 | unsigned long timeout; |
626 | 626 | ||
@@ -1020,7 +1020,7 @@ static int mcp251x_can_probe(struct spi_device *spi) | |||
1020 | CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY; | 1020 | CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY; |
1021 | priv->model = spi_get_device_id(spi)->driver_data; | 1021 | priv->model = spi_get_device_id(spi)->driver_data; |
1022 | priv->net = net; | 1022 | priv->net = net; |
1023 | dev_set_drvdata(&spi->dev, priv); | 1023 | spi_set_drvdata(spi, priv); |
1024 | 1024 | ||
1025 | priv->spi = spi; | 1025 | priv->spi = spi; |
1026 | mutex_init(&priv->mcp_lock); | 1026 | mutex_init(&priv->mcp_lock); |
@@ -1118,7 +1118,7 @@ error_out: | |||
1118 | static int mcp251x_can_remove(struct spi_device *spi) | 1118 | static int mcp251x_can_remove(struct spi_device *spi) |
1119 | { | 1119 | { |
1120 | struct mcp251x_platform_data *pdata = spi->dev.platform_data; | 1120 | struct mcp251x_platform_data *pdata = spi->dev.platform_data; |
1121 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 1121 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
1122 | struct net_device *net = priv->net; | 1122 | struct net_device *net = priv->net; |
1123 | 1123 | ||
1124 | unregister_candev(net); | 1124 | unregister_candev(net); |
@@ -1144,7 +1144,7 @@ static int mcp251x_can_suspend(struct device *dev) | |||
1144 | { | 1144 | { |
1145 | struct spi_device *spi = to_spi_device(dev); | 1145 | struct spi_device *spi = to_spi_device(dev); |
1146 | struct mcp251x_platform_data *pdata = spi->dev.platform_data; | 1146 | struct mcp251x_platform_data *pdata = spi->dev.platform_data; |
1147 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 1147 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
1148 | struct net_device *net = priv->net; | 1148 | struct net_device *net = priv->net; |
1149 | 1149 | ||
1150 | priv->force_quit = 1; | 1150 | priv->force_quit = 1; |
@@ -1176,7 +1176,7 @@ static int mcp251x_can_resume(struct device *dev) | |||
1176 | { | 1176 | { |
1177 | struct spi_device *spi = to_spi_device(dev); | 1177 | struct spi_device *spi = to_spi_device(dev); |
1178 | struct mcp251x_platform_data *pdata = spi->dev.platform_data; | 1178 | struct mcp251x_platform_data *pdata = spi->dev.platform_data; |
1179 | struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); | 1179 | struct mcp251x_priv *priv = spi_get_drvdata(spi); |
1180 | 1180 | ||
1181 | if (priv->after_suspend & AFTER_SUSPEND_POWER) { | 1181 | if (priv->after_suspend & AFTER_SUSPEND_POWER) { |
1182 | pdata->power_enable(1); | 1182 | pdata->power_enable(1); |