diff options
Diffstat (limited to 'drivers/edac/mpc85xx_edac.c')
-rw-r--r-- | drivers/edac/mpc85xx_edac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index af75e27f5224..b123bb308a4a 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
@@ -200,7 +200,7 @@ static irqreturn_t mpc85xx_pci_isr(int irq, void *dev_id) | |||
200 | return IRQ_HANDLED; | 200 | return IRQ_HANDLED; |
201 | } | 201 | } |
202 | 202 | ||
203 | static int __devinit mpc85xx_pci_err_probe(struct of_device *op, | 203 | static int __devinit mpc85xx_pci_err_probe(struct platform_device *op, |
204 | const struct of_device_id *match) | 204 | const struct of_device_id *match) |
205 | { | 205 | { |
206 | struct edac_pci_ctl_info *pci; | 206 | struct edac_pci_ctl_info *pci; |
@@ -305,7 +305,7 @@ err: | |||
305 | return res; | 305 | return res; |
306 | } | 306 | } |
307 | 307 | ||
308 | static int mpc85xx_pci_err_remove(struct of_device *op) | 308 | static int mpc85xx_pci_err_remove(struct platform_device *op) |
309 | { | 309 | { |
310 | struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev); | 310 | struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev); |
311 | struct mpc85xx_pci_pdata *pdata = pci->pvt_info; | 311 | struct mpc85xx_pci_pdata *pdata = pci->pvt_info; |
@@ -503,7 +503,7 @@ static irqreturn_t mpc85xx_l2_isr(int irq, void *dev_id) | |||
503 | return IRQ_HANDLED; | 503 | return IRQ_HANDLED; |
504 | } | 504 | } |
505 | 505 | ||
506 | static int __devinit mpc85xx_l2_err_probe(struct of_device *op, | 506 | static int __devinit mpc85xx_l2_err_probe(struct platform_device *op, |
507 | const struct of_device_id *match) | 507 | const struct of_device_id *match) |
508 | { | 508 | { |
509 | struct edac_device_ctl_info *edac_dev; | 509 | struct edac_device_ctl_info *edac_dev; |
@@ -613,7 +613,7 @@ err: | |||
613 | return res; | 613 | return res; |
614 | } | 614 | } |
615 | 615 | ||
616 | static int mpc85xx_l2_err_remove(struct of_device *op) | 616 | static int mpc85xx_l2_err_remove(struct platform_device *op) |
617 | { | 617 | { |
618 | struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&op->dev); | 618 | struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&op->dev); |
619 | struct mpc85xx_l2_pdata *pdata = edac_dev->pvt_info; | 619 | struct mpc85xx_l2_pdata *pdata = edac_dev->pvt_info; |
@@ -956,7 +956,7 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci) | |||
956 | } | 956 | } |
957 | } | 957 | } |
958 | 958 | ||
959 | static int __devinit mpc85xx_mc_err_probe(struct of_device *op, | 959 | static int __devinit mpc85xx_mc_err_probe(struct platform_device *op, |
960 | const struct of_device_id *match) | 960 | const struct of_device_id *match) |
961 | { | 961 | { |
962 | struct mem_ctl_info *mci; | 962 | struct mem_ctl_info *mci; |
@@ -1088,7 +1088,7 @@ err: | |||
1088 | return res; | 1088 | return res; |
1089 | } | 1089 | } |
1090 | 1090 | ||
1091 | static int mpc85xx_mc_err_remove(struct of_device *op) | 1091 | static int mpc85xx_mc_err_remove(struct platform_device *op) |
1092 | { | 1092 | { |
1093 | struct mem_ctl_info *mci = dev_get_drvdata(&op->dev); | 1093 | struct mem_ctl_info *mci = dev_get_drvdata(&op->dev); |
1094 | struct mpc85xx_mc_pdata *pdata = mci->pvt_info; | 1094 | struct mpc85xx_mc_pdata *pdata = mci->pvt_info; |