diff options
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 12 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index b76731edbf10..57f7703ce2e8 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
@@ -647,7 +647,7 @@ static int __devinit fsl_i2c_probe(struct platform_device *op) | |||
647 | } | 647 | } |
648 | 648 | ||
649 | if (match->data) { | 649 | if (match->data) { |
650 | struct mpc_i2c_data *data = match->data; | 650 | const struct mpc_i2c_data *data = match->data; |
651 | data->setup(op->dev.of_node, i2c, clock, data->prescaler); | 651 | data->setup(op->dev.of_node, i2c, clock, data->prescaler); |
652 | } else { | 652 | } else { |
653 | /* Backwards compatibility */ | 653 | /* Backwards compatibility */ |
@@ -730,24 +730,24 @@ static int mpc_i2c_resume(struct device *dev) | |||
730 | SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume); | 730 | SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume); |
731 | #endif | 731 | #endif |
732 | 732 | ||
733 | static struct mpc_i2c_data mpc_i2c_data_512x __devinitdata = { | 733 | static const struct mpc_i2c_data mpc_i2c_data_512x __devinitdata = { |
734 | .setup = mpc_i2c_setup_512x, | 734 | .setup = mpc_i2c_setup_512x, |
735 | }; | 735 | }; |
736 | 736 | ||
737 | static struct mpc_i2c_data mpc_i2c_data_52xx __devinitdata = { | 737 | static const struct mpc_i2c_data mpc_i2c_data_52xx __devinitdata = { |
738 | .setup = mpc_i2c_setup_52xx, | 738 | .setup = mpc_i2c_setup_52xx, |
739 | }; | 739 | }; |
740 | 740 | ||
741 | static struct mpc_i2c_data mpc_i2c_data_8313 __devinitdata = { | 741 | static const struct mpc_i2c_data mpc_i2c_data_8313 __devinitdata = { |
742 | .setup = mpc_i2c_setup_8xxx, | 742 | .setup = mpc_i2c_setup_8xxx, |
743 | }; | 743 | }; |
744 | 744 | ||
745 | static struct mpc_i2c_data mpc_i2c_data_8543 __devinitdata = { | 745 | static const struct mpc_i2c_data mpc_i2c_data_8543 __devinitdata = { |
746 | .setup = mpc_i2c_setup_8xxx, | 746 | .setup = mpc_i2c_setup_8xxx, |
747 | .prescaler = 2, | 747 | .prescaler = 2, |
748 | }; | 748 | }; |
749 | 749 | ||
750 | static struct mpc_i2c_data mpc_i2c_data_8544 __devinitdata = { | 750 | static const struct mpc_i2c_data mpc_i2c_data_8544 __devinitdata = { |
751 | .setup = mpc_i2c_setup_8xxx, | 751 | .setup = mpc_i2c_setup_8xxx, |
752 | .prescaler = 3, | 752 | .prescaler = 3, |
753 | }; | 753 | }; |
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 5d19a49803c1..a0e49f6aaf96 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -944,7 +944,8 @@ omap_i2c_probe(struct platform_device *pdev) | |||
944 | struct omap_i2c_dev *dev; | 944 | struct omap_i2c_dev *dev; |
945 | struct i2c_adapter *adap; | 945 | struct i2c_adapter *adap; |
946 | struct resource *mem, *irq, *ioarea; | 946 | struct resource *mem, *irq, *ioarea; |
947 | struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data; | 947 | const struct omap_i2c_bus_platform_data *pdata = |
948 | pdev->dev.platform_data; | ||
948 | struct device_node *node = pdev->dev.of_node; | 949 | struct device_node *node = pdev->dev.of_node; |
949 | const struct of_device_id *match; | 950 | const struct of_device_id *match; |
950 | irq_handler_t isr; | 951 | irq_handler_t isr; |