diff options
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 8 | ||||
| -rw-r--r-- | drivers/i2c/i2c-core.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 73a092fb0e7e..69fa282df2d5 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -879,14 +879,12 @@ static int s3c24xx_i2c_remove(struct device *dev) | |||
| 879 | } | 879 | } |
| 880 | 880 | ||
| 881 | #ifdef CONFIG_PM | 881 | #ifdef CONFIG_PM |
| 882 | static int s3c24xx_i2c_resume(struct device *dev, u32 level) | 882 | static int s3c24xx_i2c_resume(struct device *dev) |
| 883 | { | 883 | { |
| 884 | struct s3c24xx_i2c *i2c = dev_get_drvdata(dev); | 884 | struct s3c24xx_i2c *i2c = dev_get_drvdata(dev); |
| 885 | 885 | ||
| 886 | if (i2c != NULL && level == RESUME_ENABLE) { | 886 | if (i2c != NULL) |
| 887 | dev_dbg(dev, "resume: level %d\n", level); | ||
| 888 | s3c24xx_i2c_init(i2c); | 887 | s3c24xx_i2c_init(i2c); |
| 889 | } | ||
| 890 | 888 | ||
| 891 | return 0; | 889 | return 0; |
| 892 | } | 890 | } |
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index dda472e5e8be..45aa0e54e297 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
| @@ -48,7 +48,7 @@ static int i2c_bus_suspend(struct device * dev, pm_message_t state) | |||
| 48 | int rc = 0; | 48 | int rc = 0; |
| 49 | 49 | ||
| 50 | if (dev->driver && dev->driver->suspend) | 50 | if (dev->driver && dev->driver->suspend) |
| 51 | rc = dev->driver->suspend(dev,state,0); | 51 | rc = dev->driver->suspend(dev, state); |
| 52 | return rc; | 52 | return rc; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| @@ -57,7 +57,7 @@ static int i2c_bus_resume(struct device * dev) | |||
| 57 | int rc = 0; | 57 | int rc = 0; |
| 58 | 58 | ||
| 59 | if (dev->driver && dev->driver->resume) | 59 | if (dev->driver && dev->driver->resume) |
| 60 | rc = dev->driver->resume(dev,0); | 60 | rc = dev->driver->resume(dev); |
| 61 | return rc; | 61 | return rc; |
| 62 | } | 62 | } |
| 63 | 63 | ||
