aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-bfin-twi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c/busses/i2c-bfin-twi.c')
-rw-r--r--drivers/i2c/busses/i2c-bfin-twi.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 37d423964c46..35a473ba3d81 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -674,8 +674,9 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
674 p_adap->timeout = 5 * HZ; 674 p_adap->timeout = 5 * HZ;
675 p_adap->retries = 3; 675 p_adap->retries = 3;
676 676
677 rc = peripheral_request_list((unsigned short *)pdev->dev.platform_data, 677 rc = peripheral_request_list(
678 "i2c-bfin-twi"); 678 (unsigned short *)dev_get_platdata(&pdev->dev),
679 "i2c-bfin-twi");
679 if (rc) { 680 if (rc) {
680 dev_err(&pdev->dev, "Can't setup pin mux!\n"); 681 dev_err(&pdev->dev, "Can't setup pin mux!\n");
681 goto out_error_pin_mux; 682 goto out_error_pin_mux;
@@ -722,7 +723,7 @@ out_error_add_adapter:
722 free_irq(iface->irq, iface); 723 free_irq(iface->irq, iface);
723out_error_req_irq: 724out_error_req_irq:
724out_error_no_irq: 725out_error_no_irq:
725 peripheral_free_list((unsigned short *)pdev->dev.platform_data); 726 peripheral_free_list((unsigned short *)dev_get_platdata(&pdev->dev));
726out_error_pin_mux: 727out_error_pin_mux:
727 iounmap(iface->regs_base); 728 iounmap(iface->regs_base);
728out_error_ioremap: 729out_error_ioremap:
@@ -738,7 +739,7 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
738 739
739 i2c_del_adapter(&(iface->adap)); 740 i2c_del_adapter(&(iface->adap));
740 free_irq(iface->irq, iface); 741 free_irq(iface->irq, iface);
741 peripheral_free_list((unsigned short *)pdev->dev.platform_data); 742 peripheral_free_list((unsigned short *)dev_get_platdata(&pdev->dev));
742 iounmap(iface->regs_base); 743 iounmap(iface->regs_base);
743 kfree(iface); 744 kfree(iface);
744 745