Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757842AbaGQRCa (ORCPT ); Thu, 17 Jul 2014 13:02:30 -0400 Received: from mail-oi0-f53.google.com ([209.85.218.53]:59658 "EHLO mail-oi0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756647AbaGQRC1 (ORCPT ); Thu, 17 Jul 2014 13:02:27 -0400 X-Greylist: delayed 497 seconds by postgrey-1.27 at vger.kernel.org; Thu, 17 Jul 2014 13:02:27 EDT MIME-Version: 1.0 In-Reply-To: <1405608520-5644-3-git-send-email-hechtb@gmail.com> References: <1405608520-5644-1-git-send-email-hechtb@gmail.com> <1405608520-5644-3-git-send-email-hechtb@gmail.com> Date: Thu, 17 Jul 2014 18:54:10 +0200 Message-ID: Subject: Re: [PATCH v3 3/5] i2c: exynos5: Remove suspension check From: Bastian Hecht To: linux-i2c@vger.kernel.org Cc: Linux-SH , Tomoya MORINAGA , Wolfram Sang , "linux-arm-kernel@lists.infradead.org" , Bastian Hecht , Kukjin Kim , Naveen Krishna Ch , Jingoo Han , Jean Delvare , Linus Walleij , Masanari Iida , Sachin Kamat , "moderated list:ARM/S5P EXYNOS AR..." , open list Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2014-07-17 16:48 GMT+02:00 Bastian Hecht : > We now take care of suspension in the i2c core code. So we can remove this > check here. > > Signed-off-by: Bastian Hecht > --- > same as v1 > > drivers/i2c/busses/i2c-exynos5.c | 20 +------------------- > 1 file changed, 1 insertion(+), 19 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c > index 63d2292..a80cf28 100644 > --- a/drivers/i2c/busses/i2c-exynos5.c > +++ b/drivers/i2c/busses/i2c-exynos5.c > @@ -145,7 +145,6 @@ > > struct exynos5_i2c { > struct i2c_adapter adap; > - unsigned int suspended:1; > > struct i2c_msg *msg; > struct completion msg_complete; > @@ -610,11 +609,6 @@ static int exynos5_i2c_xfer(struct i2c_adapter *adap, > struct exynos5_i2c *i2c = adap->algo_data; > int i = 0, ret = 0, stop = 0; > > - if (i2c->suspended) { > - dev_err(i2c->dev, "HS-I2C is not initialized.\n"); > - return -EIO; > - } > - > clk_prepare_enable(i2c->clk); > > for (i = 0; i < num; i++, msgs++) { > @@ -757,16 +751,6 @@ static int exynos5_i2c_remove(struct platform_device *pdev) > } > > #ifdef CONFIG_PM_SLEEP > -static int exynos5_i2c_suspend_noirq(struct device *dev) > -{ > - struct platform_device *pdev = to_platform_device(dev); > - struct exynos5_i2c *i2c = platform_get_drvdata(pdev); > - > - i2c->suspended = 1; > - > - return 0; > -} > - > static int exynos5_i2c_resume_noirq(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > @@ -783,14 +767,12 @@ static int exynos5_i2c_resume_noirq(struct device *dev) > > exynos5_i2c_init(i2c); > clk_disable_unprepare(i2c->clk); > - i2c->suspended = 0; > > return 0; > } > #endif > > -static SIMPLE_DEV_PM_OPS(exynos5_i2c_dev_pm_ops, exynos5_i2c_suspend_noirq, > - exynos5_i2c_resume_noirq); > +static SIMPLE_DEV_PM_OPS(exynos5_i2c_dev_pm_ops, exynos5_i2c_resume_noirq); This should be +static SIMPLE_DEV_PM_OPS(exynos5_i2c_dev_pm_ops, NULL, exynos5_i2c_resume_noirq); And this is v2, not v3. > static struct platform_driver exynos5_i2c_driver = { > .probe = exynos5_i2c_probe, > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/