From patchwork Fri Mar 22 02:13:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 229868 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5124A2C00BC for ; Fri, 22 Mar 2013 13:13:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753731Ab3CVCN5 (ORCPT ); Thu, 21 Mar 2013 22:13:57 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:29026 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765Ab3CVCN4 (ORCPT ); Thu, 21 Mar 2013 22:13:56 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MK100IMNI6WPXH0@mailout1.samsung.com> for linux-i2c@vger.kernel.org; Fri, 22 Mar 2013 11:13:53 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 07.18.07735.06EBB415; Fri, 22 Mar 2013 11:13:52 +0900 (KST) X-AuditID: cbfee68e-b7f946d000001e37-05-514bbe601bac Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id ED.1A.17838.06EBB415; Fri, 22 Mar 2013 11:13:52 +0900 (KST) Received: from DOJG1HAN02 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MK10054II74ZTI0@mmp1.samsung.com>; Fri, 22 Mar 2013 11:13:52 +0900 (KST) From: Jingoo Han To: 'Wolfram Sang' Cc: 'Wolfram Sang' , linux-i2c@vger.kernel.org, 'Ben Dooks' , 'Jingoo Han' References: <00b901ce26a2$cb3c57d0$61b50770$%han@samsung.com> In-reply-to: <00b901ce26a2$cb3c57d0$61b50770$%han@samsung.com> Subject: [PATCH 2/2] i2c: ocores: add CONFIG_PM_SLEEP to suspend/resume functions Date: Fri, 22 Mar 2013 11:13:52 +0900 Message-id: <00ba01ce26a2$e5f74cb0$b1e5e610$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4momsK3fRN9W4JRiivnaHc1UUSpgAACvDQAAAQFjA= Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCIsWRmVeSWpSXmKPExsVy+t8zI92Efd6BBjP+WFlMWneAyeLywkus Fh1/vzBa9GyfyWax8sQsZgdWj7+rXjB79G1Zxehx8tQTFo/Pm+QCWKK4bFJSczLLUov07RK4 MhrPzWAq6OStWLL6HVMD40+uLkZODgkBE4npK04yQdhiEhfurWfrYuTiEBJYxiix5/RMdpii d0emsUMkFjFK3Hz3ggXC+cUosX77ChaQKjYBNYkvXw6DdYgA2c8+fmUEKWIW6GOUeNy+HaxI SMBW4v7/xWBFnAJ2Eld/n2YGsYUFgiXWbjwBdgeLgKrEpeWXwWp4gepnLFzCCmELSvyYfA9s DrOAlsT6nceZIGx5ic1r3gLN4QA6VV3i0V9diBusJJ4+mMsIUSIise/FO7B7JAQusUucaFzN CLFLQOLb5EMsEL2yEpsOMEN8LClxcMUNlgmMErOQbJ6FZPMsJJtnIVmxgJFlFaNoakFyQXFS epGRXnFibnFpXrpecn7uJkZIjPbtYLx5wPoQYzLQ+onMUqLJ+cAYzyuJNzQ2M7IwNTE1NjK3 NCNNWEmcV63FOlBIID2xJDU7NbUgtSi+qDQntfgQIxMHp1QDY8SqGRZ2Qle67l41tIxjZQk3 dXht3F2ROrVx3UWzlUlPhfMWcV3MnNRylvH3rj9PPlrOsF+fLxdk/d0xJ/n4pGVB+8XfuN// e6spIWAl+wMDrht3fLjXLZulKTXNy+vMj+OML+98qqpvWb/JyuGHgIxexYTuJ+c5619rSmbd 3b7Xu03syZyJ/5VYijMSDbWYi4oTAcYK5mznAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIKsWRmVeSWpSXmKPExsVy+t9jAd2Efd6BBis6zS0mrTvAZHF54SVW i46/XxgterbPZLNYeWIWswOrx99VL5g9+rasYvQ4eeoJi8fnTXIBLFENjDYZqYkpqUUKqXnJ +SmZeem2St7B8c7xpmYGhrqGlhbmSgp5ibmptkouPgG6bpk5QIuVFMoSc0qBQgGJxcVK+naY JoSGuOlawDRG6PqGBMH1GBmggYR1jBmN52YwFXTyVixZ/Y6pgfEnVxcjJ4eEgInEuyPT2CFs MYkL99azdTFycQgJLGKUuPnuBQuE84tRYv32FSwgVWwCahJfvhwG6xABsp99/MoIUsQs0Mco 8bh9O1iRkICtxP3/i8GKOAXsJK7+Ps0MYgsLBEus3XiCCcRmEVCVuLT8MlgNL1D9jIVLWCFs QYkfk++BzWEW0JJYv/M4E4QtL7F5zVugORxAp6pLPPqrC3GDlcTTB3MZIUpEJPa9eMc4gVFo FpJJs5BMmoVk0iwkLQsYWVYxiqYWJBcUJ6XnGuoVJ+YWl+al6yXn525iBCeAZ1I7GFc2WBxi FOBgVOLh1dDxDhRiTSwrrsw9xCjBwawkwhuZAhTiTUmsrEotyo8vKs1JLT7EmAz06ERmKdHk fGByyiuJNzQ2MTOyNDKzMDIxNydNWEmc90CrdaCQQHpiSWp2ampBahHMFiYOTqkGxi2P2xO/ uSQo8qbKSkTHtS7q4pX7JJW3wtFtgsiOyv6OyLZZAfxmW6ZMrom9Mzf6e+eysyn/z6/PSVDf X/yky/ffymRh/rWFmdNUp51sfr7el8+wbdrJxJZVrEv37zPoP+HjJzT1hfT0Bt2yrXfqW2/f dVLY0FR7n0fASM9GXIctTs9G5bq5EktxRqKhFnNRcSIA1FN810QDAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following build warning when CONFIG_PM_SLEEP is not selected. This is because sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled. drivers/i2c/busses/i2c-ocores.c:460:12: warning: 'ocores_i2c_suspend' defined but not used [-Wunused-function] drivers/i2c/busses/i2c-ocores.c:471:12: warning: 'ocores_i2c_resume' defined but not used [-Wunused-function] Signed-off-by: Jingoo Han --- drivers/i2c/busses/i2c-ocores.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index 0e1f824..1ecea5e 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c @@ -456,7 +456,7 @@ static int ocores_i2c_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int ocores_i2c_suspend(struct device *dev) { struct ocores_i2c *i2c = dev_get_drvdata(dev); @@ -476,12 +476,9 @@ static int ocores_i2c_resume(struct device *dev) return 0; } +#endif static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume); -#define OCORES_I2C_PM (&ocores_i2c_pm) -#else -#define OCORES_I2C_PM NULL -#endif static struct platform_driver ocores_i2c_driver = { .probe = ocores_i2c_probe, @@ -490,7 +487,7 @@ static struct platform_driver ocores_i2c_driver = { .owner = THIS_MODULE, .name = "ocores-i2c", .of_match_table = ocores_i2c_match, - .pm = OCORES_I2C_PM, + .pm = &ocores_i2c_pm, }, };