From patchwork Tue Dec 17 20:05:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 302460 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 EB0402C007C for ; Wed, 18 Dec 2013 07:07:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752314Ab3LQUFf (ORCPT ); Tue, 17 Dec 2013 15:05:35 -0500 Received: from mail-pd0-f179.google.com ([209.85.192.179]:62489 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752032Ab3LQUFc (ORCPT ); Tue, 17 Dec 2013 15:05:32 -0500 Received: by mail-pd0-f179.google.com with SMTP id r10so7276864pdi.10 for ; Tue, 17 Dec 2013 12:05:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=km77bqL6r9CyfDeeXgqqxnH+orurHynYEAj+F8SK1gI=; b=pa+Lmiy4mK5SzPic8VdLj/vJyikghAhfT6DraG4/GOifByQc9RdIq/FukexiC0Dv8q gI1yvhrUEoadAcOEEyTbvmn26Zc6ZOpxoj7Xpl9KXLLI/N1s6OKLPtYUXo4Rfh3PORBK lAv1CbnTare0wIq+LCMRHlnvR2DfzIHNwIkFB2ungxGEmpe3Q86bruSJOqgK9vl1tRkf IODMCMaqFtOx3/JqaLEMqlC/J7xrjUpnSX3KDdDRwmbP/bQM+CVZBs2IJXPEWR6ALN14 vakPKCBoqDhroheEgYb6r8k668HPlfT+CKxfQAdzOZGIw6gHn2BF+eIAHVWKaLRKATKV vR2w== X-Received: by 10.66.25.36 with SMTP id z4mr29495385paf.101.1387310732153; Tue, 17 Dec 2013 12:05:32 -0800 (PST) Received: from [192.168.211.137] ([66.129.239.12]) by mx.google.com with ESMTPSA id wd6sm48581869pab.3.2013.12.17.12.05.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 12:05:31 -0800 (PST) Message-ID: <52B0AE88.8090203@gmail.com> Date: Tue, 17 Dec 2013 12:05:28 -0800 From: Rajat Jain User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: Bjorn Helgaas , Kenji Kaneshige , Alex Williamson , Yijing Wang , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu CC: Guenter Roeck , Rajat Jain , Rajat Jain Subject: [PATCH v3 1/8] pciehp: Make check_link_active() non-static Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org check_link_active() functionality needs to be used by subsequent patches (that introduce link state change based hotplug). Thus make the function non-static, and rename it to pciehp_check_link_active() so as to be consistent with other non-static functions. Signed-off-by: Rajat Jain Signed-off-by: Guenter Roeck --- v3: Same as v2, only numbering changed from [1/4] to [1/8] v2: Same as v1, dropped the "RFC" from subject, and added Guenter's signature v1: Initial patch drivers/pci/hotplug/pciehp.h | 1 + drivers/pci/hotplug/pciehp_hpc.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 21e865d..4ffcf6b 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -154,6 +154,7 @@ void pciehp_green_led_on(struct slot *slot); void pciehp_green_led_off(struct slot *slot); void pciehp_green_led_blink(struct slot *slot); int pciehp_check_link_status(struct controller *ctrl); +bool pciehp_check_link_active(struct controller *ctrl); void pciehp_release_ctrl(struct controller *ctrl); int pciehp_reset_slot(struct slot *slot, int probe); diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 3eea3fd..f8c7a5f 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -241,7 +241,7 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask) return retval; } -static bool check_link_active(struct controller *ctrl) +bool pciehp_check_link_active(struct controller *ctrl) { bool ret = false; u16 lnk_status; @@ -261,12 +261,12 @@ static void __pcie_wait_link_active(struct controller *ctrl, bool active) { int timeout = 1000; - if (check_link_active(ctrl) == active) + if (pciehp_check_link_active(ctrl) == active) return; while (timeout > 0) { msleep(10); timeout -= 10; - if (check_link_active(ctrl) == active) + if (pciehp_check_link_active(ctrl) == active) return; } ctrl_dbg(ctrl, "Data Link Layer Link Active not %s in 1000 msec\n",