diff options
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-cpm.c | 8 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-ibm_iic.c | 6 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index e591de1bc704..f7bd2613cecc 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c | |||
| @@ -105,7 +105,7 @@ struct i2c_reg { | |||
| 105 | 105 | ||
| 106 | struct cpm_i2c { | 106 | struct cpm_i2c { |
| 107 | char *base; | 107 | char *base; |
| 108 | struct of_device *ofdev; | 108 | struct platform_device *ofdev; |
| 109 | struct i2c_adapter adap; | 109 | struct i2c_adapter adap; |
| 110 | uint dp_addr; | 110 | uint dp_addr; |
| 111 | int version; /* CPM1=1, CPM2=2 */ | 111 | int version; /* CPM1=1, CPM2=2 */ |
| @@ -428,7 +428,7 @@ static const struct i2c_adapter cpm_ops = { | |||
| 428 | 428 | ||
| 429 | static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) | 429 | static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) |
| 430 | { | 430 | { |
| 431 | struct of_device *ofdev = cpm->ofdev; | 431 | struct platform_device *ofdev = cpm->ofdev; |
| 432 | const u32 *data; | 432 | const u32 *data; |
| 433 | int len, ret, i; | 433 | int len, ret, i; |
| 434 | void __iomem *i2c_base; | 434 | void __iomem *i2c_base; |
| @@ -634,7 +634,7 @@ static void cpm_i2c_shutdown(struct cpm_i2c *cpm) | |||
| 634 | cpm_muram_free(cpm->i2c_addr); | 634 | cpm_muram_free(cpm->i2c_addr); |
| 635 | } | 635 | } |
| 636 | 636 | ||
| 637 | static int __devinit cpm_i2c_probe(struct of_device *ofdev, | 637 | static int __devinit cpm_i2c_probe(struct platform_device *ofdev, |
| 638 | const struct of_device_id *match) | 638 | const struct of_device_id *match) |
| 639 | { | 639 | { |
| 640 | int result, len; | 640 | int result, len; |
| @@ -687,7 +687,7 @@ out_free: | |||
| 687 | return result; | 687 | return result; |
| 688 | } | 688 | } |
| 689 | 689 | ||
| 690 | static int __devexit cpm_i2c_remove(struct of_device *ofdev) | 690 | static int __devexit cpm_i2c_remove(struct platform_device *ofdev) |
| 691 | { | 691 | { |
| 692 | struct cpm_i2c *cpm = dev_get_drvdata(&ofdev->dev); | 692 | struct cpm_i2c *cpm = dev_get_drvdata(&ofdev->dev); |
| 693 | 693 | ||
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 1168d61418c9..43ca32fddde2 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c | |||
| @@ -661,7 +661,7 @@ static inline u8 iic_clckdiv(unsigned int opb) | |||
| 661 | return (u8)((opb + 9) / 10 - 1); | 661 | return (u8)((opb + 9) / 10 - 1); |
| 662 | } | 662 | } |
| 663 | 663 | ||
| 664 | static int __devinit iic_request_irq(struct of_device *ofdev, | 664 | static int __devinit iic_request_irq(struct platform_device *ofdev, |
| 665 | struct ibm_iic_private *dev) | 665 | struct ibm_iic_private *dev) |
| 666 | { | 666 | { |
| 667 | struct device_node *np = ofdev->dev.of_node; | 667 | struct device_node *np = ofdev->dev.of_node; |
| @@ -692,7 +692,7 @@ static int __devinit iic_request_irq(struct of_device *ofdev, | |||
| 692 | /* | 692 | /* |
| 693 | * Register single IIC interface | 693 | * Register single IIC interface |
| 694 | */ | 694 | */ |
| 695 | static int __devinit iic_probe(struct of_device *ofdev, | 695 | static int __devinit iic_probe(struct platform_device *ofdev, |
| 696 | const struct of_device_id *match) | 696 | const struct of_device_id *match) |
| 697 | { | 697 | { |
| 698 | struct device_node *np = ofdev->dev.of_node; | 698 | struct device_node *np = ofdev->dev.of_node; |
| @@ -780,7 +780,7 @@ error_cleanup: | |||
| 780 | /* | 780 | /* |
| 781 | * Cleanup initialized IIC interface | 781 | * Cleanup initialized IIC interface |
| 782 | */ | 782 | */ |
| 783 | static int __devexit iic_remove(struct of_device *ofdev) | 783 | static int __devexit iic_remove(struct platform_device *ofdev) |
| 784 | { | 784 | { |
| 785 | struct ibm_iic_private *dev = dev_get_drvdata(&ofdev->dev); | 785 | struct ibm_iic_private *dev = dev_get_drvdata(&ofdev->dev); |
| 786 | 786 | ||
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 6545d1c99b61..a1c419a716af 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
| @@ -560,7 +560,7 @@ static struct i2c_adapter mpc_ops = { | |||
| 560 | .timeout = HZ, | 560 | .timeout = HZ, |
| 561 | }; | 561 | }; |
| 562 | 562 | ||
| 563 | static int __devinit fsl_i2c_probe(struct of_device *op, | 563 | static int __devinit fsl_i2c_probe(struct platform_device *op, |
| 564 | const struct of_device_id *match) | 564 | const struct of_device_id *match) |
| 565 | { | 565 | { |
| 566 | struct mpc_i2c *i2c; | 566 | struct mpc_i2c *i2c; |
| @@ -646,7 +646,7 @@ static int __devinit fsl_i2c_probe(struct of_device *op, | |||
| 646 | return result; | 646 | return result; |
| 647 | }; | 647 | }; |
| 648 | 648 | ||
| 649 | static int __devexit fsl_i2c_remove(struct of_device *op) | 649 | static int __devexit fsl_i2c_remove(struct platform_device *op) |
| 650 | { | 650 | { |
| 651 | struct mpc_i2c *i2c = dev_get_drvdata(&op->dev); | 651 | struct mpc_i2c *i2c = dev_get_drvdata(&op->dev); |
| 652 | 652 | ||
