aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-07-03 18:07:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 19:07:59 -0400
commitad87a766479d027f5966c781605bc9f7bf8bab67 (patch)
tree54992384762cf768df5f19d42847fb710adfa29a
parentdfc657b1330990213a3865aaef9d8af563ccad51 (diff)
drivers/rtc/rtc-mpc5121.c: use platform_{get,set}_drvdata()
Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Cc: Grant Likely <grant.likely@linaro.org> Cc: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-mpc5121.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
index 4c024974c69f..9c8f60903799 100644
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/drivers/rtc/rtc-mpc5121.c
@@ -324,7 +324,7 @@ static int mpc5121_rtc_probe(struct platform_device *op)
324 324
325 device_init_wakeup(&op->dev, 1); 325 device_init_wakeup(&op->dev, 1);
326 326
327 dev_set_drvdata(&op->dev, rtc); 327 platform_set_drvdata(op, rtc);
328 328
329 rtc->irq = irq_of_parse_and_map(op->dev.of_node, 1); 329 rtc->irq = irq_of_parse_and_map(op->dev.of_node, 1);
330 err = request_irq(rtc->irq, mpc5121_rtc_handler, 0, 330 err = request_irq(rtc->irq, mpc5121_rtc_handler, 0,
@@ -382,7 +382,7 @@ out_dispose:
382 382
383static int mpc5121_rtc_remove(struct platform_device *op) 383static int mpc5121_rtc_remove(struct platform_device *op)
384{ 384{
385 struct mpc5121_rtc_data *rtc = dev_get_drvdata(&op->dev); 385 struct mpc5121_rtc_data *rtc = platform_get_drvdata(op);
386 struct mpc5121_rtc_regs __iomem *regs = rtc->regs; 386 struct mpc5121_rtc_regs __iomem *regs = rtc->regs;
387 387
388 /* disable interrupt, so there are no nasty surprises */ 388 /* disable interrupt, so there are no nasty surprises */