From patchwork Fri Dec 13 05:18:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Cohen X-Patchwork-Id: 3338011 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A63029F2A9 for ; Fri, 13 Dec 2013 05:15:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E79BE207F4 for ; Fri, 13 Dec 2013 05:15:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D5BD207E4 for ; Fri, 13 Dec 2013 05:15:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752110Ab3LMFO4 (ORCPT ); Fri, 13 Dec 2013 00:14:56 -0500 Received: from mga02.intel.com ([134.134.136.20]:44826 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751741Ab3LMFNq (ORCPT ); Fri, 13 Dec 2013 00:13:46 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 12 Dec 2013 21:13:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,476,1384329600"; d="scan'208";a="423990250" Received: from psi-dev26.jf.intel.com ([10.7.199.57]) by orsmga001.jf.intel.com with ESMTP; 12 Dec 2013 21:13:35 -0800 From: David Cohen To: pavel@ucw.cz, rjw@rjwysocki.net, len.brown@intel.com, sarah.a.sharp@linux.intel.com, gregkh@linuxfoundation.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, santosh.shilimkar@ti.com, David Cohen Subject: [RFC/PATCH 2/3] usb/xhci: implement proper static inline stubs when !CONFIG_PM Date: Thu, 12 Dec 2013 21:18:24 -0800 Message-Id: <1386911905-2366-3-git-send-email-david.a.cohen@linux.intel.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1386911905-2366-1-git-send-email-david.a.cohen@linux.intel.com> References: <1386911905-2366-1-git-send-email-david.a.cohen@linux.intel.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current xhci_suspend() and xhci_resume() implementation in case of CONFIG_PM not defined is buggy. If we try to use them we get the following error: drivers/usb/host/xhci-plat.c: In function ‘xhci_plat_suspend’: drivers/usb/host/xhci-plat.c:205:21: error: called object ‘0u’ is not a function drivers/usb/host/xhci-plat.c: In function ‘xhci_plat_resume’: drivers/usb/host/xhci-plat.c:213:20: error: called object ‘0u’ is not a function It happens because the function names are replaced by NULL but the brackets stay: NULL() This patch implements proper static inline stubs. Signed-off-by: David Cohen --- drivers/usb/host/xhci.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 941d5f59e4dc..6a5e7a98de7e 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1771,8 +1771,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks); int xhci_suspend(struct xhci_hcd *xhci); int xhci_resume(struct xhci_hcd *xhci, bool hibernated); #else -#define xhci_suspend NULL -#define xhci_resume NULL +static inline int +xhci_suspend(struct xhci_hcd *xhci) { return 0; } +static inline int +xhci_resume(struct xhci_hcd *xhci, bool hibernated) { return 0; } #endif int xhci_get_frame(struct usb_hcd *hcd);