From patchwork Fri Mar 29 07:05:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 2364311 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3FD9FDFB79 for ; Fri, 29 Mar 2013 07:05:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751083Ab3C2HFn (ORCPT ); Fri, 29 Mar 2013 03:05:43 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:45278 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754615Ab3C2HFm (ORCPT ); Fri, 29 Mar 2013 03:05:42 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKE000JMUD0D3O0@mailout3.samsung.com> for linux-mmc@vger.kernel.org; Fri, 29 Mar 2013 16:05:41 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.49]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id BD.35.20872.44D35515; Fri, 29 Mar 2013 16:05:40 +0900 (KST) X-AuditID: cbfee68d-b7f786d000005188-fa-51553d44aa36 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id D1.A8.17838.44D35515; Fri, 29 Mar 2013 16:05:40 +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 <0MKE00FY1UDG3J80@mmp1.samsung.com>; Fri, 29 Mar 2013 16:05:40 +0900 (KST) From: Jingoo Han To: 'Chris Ball' Cc: linux-mmc@vger.kernel.org, 'Ludovic Desroches' , 'Jingoo Han' Subject: [PATCH 1/2] mmc: atmel-mci: add CONFIG_PM_SLEEP to suspend/resume functions Date: Fri, 29 Mar 2013 16:05:40 +0900 Message-id: <003301ce2c4b$d2864fb0$7792ef10$%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: Ac4sS9JAR067EdrGQTat5rwHHKkaqA== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCIsWRmVeSWpSXmKPExsVy+t8zQ10X29BAg5/9NhbbX29ks7i88BKr xZH//YwWh2YmO7B4LPi1lcXj0JW1jB59W1YxenzeJBfAEsVlk5Kak1mWWqRvl8CVcetgYMFB noprk1eyNDDu5upi5OSQEDCR+Hq0hRnCFpO4cG89WxcjF4eQwDJGiesb1jLDFE18cYsZIrGI UeLetKVMEM4vRomzL56ygVSxCahJfPlymB3EFhFQlNjy/TiYzSxQIbHzwFGwScICYRITX09h BbFZBFQl9u66BxbnFbCVaNo9lwnCFpT4MfkeC0SvlsTmbU2sELa8xOY1b4HqOYAuUpd49FcX YpWexIZ1f6FKRCT2vXjHCHKbhMA6dokHHa1QuwQkvk0+xALRKyux6QDUY5ISB1fcYJnAKDYL yeZZSDbPQrJ5FpIVCxhZVjGKphYkFxQnpRcZ6hUn5haX5qXrJefnbmKExFjvDsbbB6wPMSYD rZ/ILCWanA+M0bySeENjMyMLUxNTYyNzSzPShJXEedVarAOFBNITS1KzU1MLUovii0pzUosP MTJxcEo1MF59Vu40efksW6nXO0WfdPzf2ud2bI/okVdW977O6Tn1tMvfVjyvZPfhVqP4XuPo omobW4ncq4qeGb4fGsNazlo/uNTP9uBAA1M/2/LZ/Fmpdpr1eQetT+YZMDcaak+J+naT08yn NW1vs08Gp7lQtFa65df3D+RbvQ2OJ/g8sZz7yOQN77yLSizFGYmGWsxFxYkALUsyJ8cCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIKsWRmVeSWpSXmKPExsVy+t9jAV0X29BAgyv/zS22v97IZnF54SVW iyP/+xktDs1MdmDxWPBrK4vHoStrGT36tqxi9Pi8SS6AJaqB0SYjNTEltUghNS85PyUzL91W yTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMHaKWSQlliTilQKCCxuFhJ3w7ThNAQN10L mMYIXd+QILgeIwM0kLCOMePWwcCCgzwV1yavZGlg3M3VxcjJISFgIjHxxS1mCFtM4sK99Wxd jFwcQgKLGCXuTVvKBOH8YpQ4++IpG0gVm4CaxJcvh9lBbBEBRYkt34+D2cwCFRI7DxwFmyQs ECYx8fUUVhCbRUBVYu+ue2BxXgFbiabdc5kgbEGJH5PvsUD0akls3tbECmHLS2xe8xaongPo InWJR391IVbpSWxY9xeqRERi34t3jBMYBWYhmTQLyaRZSCbNQtKygJFlFaNoakFyQXFSeq6h XnFibnFpXrpecn7uJkZwBD+T2sG4ssHiEKMAB6MSD++MiJBAIdbEsuLK3EOMEhzMSiK8h61D A4V4UxIrq1KL8uOLSnNSiw8xJgM9OpFZSjQ5H5hc8kriDY1NzIwsjcwsjEzMzUkTVhLnPdBq HSgkkJ5YkpqdmlqQWgSzhYmDU6qBcZ3InrNzzl9PyX8nxxxaEvfbPNfv4faYCdyu4Smp06Um OJTW3yqJSX4VVeQygfOd4kvtLdeyJH8XCaU88kpYllL7752LR/mK6bnOq/h54jn8bn4MXn6K LfjoE3XTuOKfmfutD09/5DRfoXvG/1z1PX+udVyyMZRnC9+v8mhy4eqm+V6PnN7UKrEUZyQa ajEXFScCAP2e3qEkAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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/mmc/host/atmel-mci.c:2526:12: warning: 'atmci_suspend' defined but not used [-Wunused-function] drivers/mmc/host/atmel-mci.c:2556:12: warning: 'atmci_resume' defined but not used [-Wunused-function] Signed-off-by: Jingoo Han --- drivers/mmc/host/atmel-mci.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 10f8b73..172f874 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -2499,7 +2499,7 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int atmci_suspend(struct device *dev) { struct atmel_mci *host = dev_get_drvdata(dev); @@ -2554,17 +2554,15 @@ static int atmci_resume(struct device *dev) return ret; } -static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); -#define ATMCI_PM_OPS (&atmci_pm) -#else -#define ATMCI_PM_OPS NULL #endif +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", - .pm = ATMCI_PM_OPS, + .pm = &atmci_pm, .of_match_table = of_match_ptr(atmci_dt_ids), }, };