From patchwork Fri Feb 24 06:54:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 731941 X-Patchwork-Delegate: bhelgaas@google.com 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 3vV20f5spDz9s7t for ; Fri, 24 Feb 2017 17:54:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751172AbdBXGy4 (ORCPT ); Fri, 24 Feb 2017 01:54:56 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:23185 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751115AbdBXGy4 (ORCPT ); Fri, 24 Feb 2017 01:54:56 -0500 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v1O6soWj007607 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Feb 2017 06:54:51 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v1O6soeM014017 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Feb 2017 06:54:50 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id v1O6snoI002543; Fri, 24 Feb 2017 06:54:49 GMT Received: from localhost.localdomain (/10.159.174.70) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 23 Feb 2017 22:54:48 -0800 From: Yinghai Lu To: Bjorn Helgaas Cc: Ashok Raj , james puthukattukaran , Yinghai Lu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH] PCI, pciehp: Reuse set_slot_off() Date: Thu, 23 Feb 2017 22:54:35 -0800 Message-Id: <20170224065435.14954-1-yinghai@kernel.org> X-Mailer: git-send-email 2.8.3 X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Now set_slot_off() is used in board_added() err path. We could reuse in remove_board. Also need to move green_led and attention_status out it. and make code more readable. Signed-off-by: Yinghai Lu --- drivers/pci/hotplug/pciehp_ctrl.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) Index: linux-2.6/drivers/pci/hotplug/pciehp_ctrl.c =================================================================== --- linux-2.6.orig/drivers/pci/hotplug/pciehp_ctrl.c +++ linux-2.6/drivers/pci/hotplug/pciehp_ctrl.c @@ -71,9 +71,6 @@ static void set_slot_off(struct controll */ msleep(1000); } - - pciehp_green_led_off(pslot); - pciehp_set_attention_status(pslot, 1); } /** @@ -126,6 +123,8 @@ static int board_added(struct slot *p_sl err_exit: set_slot_off(ctrl, p_slot); + pciehp_green_led_off(p_slot); + pciehp_set_attention_status(p_slot, 1); return retval; } @@ -142,16 +141,7 @@ static int remove_board(struct slot *p_s if (retval) return retval; - if (POWER_CTRL(ctrl)) { - pciehp_power_off_slot(p_slot); - - /* - * After turning power off, we must wait for at least 1 second - * before taking any action that relies on power having been - * removed from the slot/adapter. - */ - msleep(1000); - } + set_slot_off(ctrl, p_slot); /* turn off Green LED */ pciehp_green_led_off(p_slot);