From patchwork Fri Apr 27 15:16:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 155511 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 3CA9FB6FA5 for ; Sat, 28 Apr 2012 01:23:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932326Ab2D0PWA (ORCPT ); Fri, 27 Apr 2012 11:22:00 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:61293 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932261Ab2D0PV6 (ORCPT ); Fri, 27 Apr 2012 11:21:58 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so666347pbb.19 for ; Fri, 27 Apr 2012 08:21:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=ETWANop40Q01cnBTXl1LOnJ4nyzbL6irNoM6Y4yFLCM=; b=Er2VIiihOfDprKqBr2C3DdJexLSPqXXoA0bdcdAOEAxscqJBc3WgY3rB4mp/9zw/df Lp5odOGw+Exx1J1gEkZSugT1lEohesV4STD1aLq7oV2r24i4xzmGapgb9Vi0YiRui3CU 2ed2nD9M4mAA+7/gKyqPl9UohRL+1svBasZktvMyCzoQ994hGd0GwEin6JramVRo2lfL o+iXnfe6NZu/STm9v4GunXR7gIn1MAoKmX9m/yJoV2YdDXV8feSVG89tSrBDbYMvlvzd q0wi0loY1XzZ8XcnwyomphKlj2qzUqfFmacj/jqzyrlw365dmN2hQ+QnjdnV9+UTzhfK 7JjA== Received: by 10.68.75.45 with SMTP id z13mr12476722pbv.100.1335540118703; Fri, 27 Apr 2012 08:21:58 -0700 (PDT) Received: from localhost.localdomain ([221.221.26.142]) by mx.google.com with ESMTPS id 2sm6743917pbw.57.2012.04.27.08.21.50 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Apr 2012 08:21:57 -0700 (PDT) From: Jiang Liu To: Yinghai Lu , Kenji Kaneshige , Bjorn Helgaas , Don Dutile , Greg KH Cc: Jiang Liu , Keping Chen , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [PATCH v2 13/19] PCI: trivial code clean up in cpci_hotplug_core.c Date: Fri, 27 Apr 2012 23:16:54 +0800 Message-Id: <1335539820-11232-14-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1335539820-11232-1-git-send-email-jiang.liu@huawei.com> References: <1335539820-11232-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu 1) get rid of redundant lock operations in cpcihp_core. 2) return suitable error code instead of -1. Signed-off-by: Jiang Liu --- drivers/pci/hotplug/cpci_hotplug_core.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c index 3fadf2f..7898023 100644 --- a/drivers/pci/hotplug/cpci_hotplug_core.c +++ b/drivers/pci/hotplug/cpci_hotplug_core.c @@ -304,7 +304,7 @@ cpci_hp_unregister_bus(struct pci_bus *bus) down_write(&list_rwsem); if (!slots) { up_write(&list_rwsem); - return -1; + return -ENODEV; } list_for_each_entry_safe(slot, tmp, &slot_list, slot_list) { if (slot->bus == bus) { @@ -357,11 +357,6 @@ init_slots(int clear_ins) struct pci_dev* dev; dbg("%s - enter", __func__); - down_read(&list_rwsem); - if (!slots) { - up_read(&list_rwsem); - return -1; - } list_for_each_entry(slot, &slot_list, slot_list) { dbg("%s - looking at slot %s", __func__, slot_name(slot)); if (clear_ins && cpci_check_and_clear_ins(slot)) @@ -376,7 +371,6 @@ init_slots(int clear_ins) slot->dev = dev; } } - up_read(&list_rwsem); dbg("%s - exit", __func__); return 0; } @@ -585,7 +579,7 @@ cpci_hp_register_controller(struct cpci_hp_controller *new_controller) int status = 0; if (controller) - return -1; + return -EBUSY; if (!(new_controller && new_controller->ops)) return -EINVAL; if (new_controller->irq) { @@ -620,15 +614,11 @@ cleanup_slots(void) * and free up all memory that we had allocated. */ down_write(&list_rwsem); - if (!slots) - goto cleanup_null; list_for_each_entry_safe(slot, tmp, &slot_list, slot_list) { list_del(&slot->slot_list); pci_hp_deregister(slot->hotplug_slot); } -cleanup_null: up_write(&list_rwsem); - return; } int @@ -663,9 +653,9 @@ cpci_hp_start(void) up_read(&list_rwsem); return -ENODEV; } + status = init_slots(first); up_read(&list_rwsem); - status = init_slots(first); if (first) first = 0; if (status)