aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-11-20 05:50:34 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-12 12:32:38 -0500
commita0dcf19f59d4f37150a6b7e115925d72aca15293 (patch)
tree589b1526ee3ca19000cafbcacf05779aa6e9d022 /drivers/i2c
parentbba2be480b981bc1e7bea24c2a2552b0ad7e9774 (diff)
ARM: PNX4008: move i2c suspend/resume callbacks into driver
Acked-by: Vitaly Wool <vitalywool@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-pnx.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 5d1c2603a130..bc8075514e53 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -545,18 +545,23 @@ static struct i2c_algorithm pnx_algorithm = {
545 .functionality = i2c_pnx_func, 545 .functionality = i2c_pnx_func,
546}; 546};
547 547
548#ifdef CONFIG_PM
548static int i2c_pnx_controller_suspend(struct platform_device *pdev, 549static int i2c_pnx_controller_suspend(struct platform_device *pdev,
549 pm_message_t state) 550 pm_message_t state)
550{ 551{
551 struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev); 552 struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev);
552 return i2c_pnx->suspend(pdev, state); 553 return i2c_pnx->set_clock_run(pdev);
553} 554}
554 555
555static int i2c_pnx_controller_resume(struct platform_device *pdev) 556static int i2c_pnx_controller_resume(struct platform_device *pdev)
556{ 557{
557 struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev); 558 struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev);
558 return i2c_pnx->resume(pdev); 559 return i2c_pnx->set_clock_run(pdev);
559} 560}
561#else
562#define i2c_pnx_controller_suspend NULL
563#define i2c_pnx_controller_resume NULL
564#endif
560 565
561static int __devinit i2c_pnx_probe(struct platform_device *pdev) 566static int __devinit i2c_pnx_probe(struct platform_device *pdev)
562{ 567{