of/rtc: rtc-mpc5121.c: Fix build failures
Grant Likely
AppliedPATCH 1/1 of/rtc: rtc-mpc5121.c: Fix build failures
Fixes build errors caused by the:
- OF device_node pointer being moved into struct device
- removal of the match_table field from struct of_platform_driver
Signed-off-by Grant Likely <grant.likely-s3s/[email protected]>
CC Paul Gortmaker <p_gortmaker-/[email protected]>
CC Alessandro Zummo <[email protected]>
CC Wolfgang Denk <[email protected]>
CC Tejun Heo <[email protected]>
CC Anatolij Gustschin <[email protected]>
CC rtc-linux-/[email protected]
CC devicetree-discuss-uLR06cmDAlY/[email protected]
---
I've applied this patch to my merge-devicetree branch
drivers/rtc/rtc-mpc5121.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
drivers/rtc/rtc-mpc5121.c +8 -6
@@ -279,7 +279,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op,if (!rtc)return -ENOMEM ; - rtc->regs =of_iomap (op->node,0 ); + rtc->regs =of_iomap (op->dev.of_node,0 );if (!rtc->regs) {dev_err (&op->dev,"%s: couldn't map io space\n" , __func__); err = -ENOSYS ;
@@ -290,7 +290,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op,dev_set_drvdata (&op->dev, rtc); - rtc->irq =irq_of_parse_and_map (op->node,1 ); + rtc->irq =irq_of_parse_and_map (op->dev.of_node,1 ); err =request_irq (rtc->irq, mpc5121_rtc_handler,IRQF_DISABLED ,"mpc5121-rtc" , &op->dev);if (err) {
@@ -299,7 +299,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op, goto out_dispose; } - rtc->irq_periodic =irq_of_parse_and_map (op->node,0 ); + rtc->irq_periodic =irq_of_parse_and_map (op->dev.of_node,0 ); err =request_irq (rtc->irq_periodic, mpc5121_rtc_handler_upd,IRQF_DISABLED ,"mpc5121-rtc_upd" , &op->dev);if (err) {
@@ -365,9 +365,11 @@ static struct of_device_id mpc5121_rtc_match[] __devinitdata = { };static struct of_platform_driver mpc5121_rtc_driver = { - .owner =THIS_MODULE , - .name ="mpc5121-rtc" , - .match_table = mpc5121_rtc_match, + .driver = { + .name ="mpc5121-rtc" , + .owner =THIS_MODULE , + .of_match_table = mpc5121_rtc_match, + }, .probe = mpc5121_rtc_probe, .remove =__devexit_p (mpc5121_rtc_remove), };