From patchwork Sat Jan 11 01:27:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 309488 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 E7DAA2C008F for ; Sat, 11 Jan 2014 12:27:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751465AbaAKB1q (ORCPT ); Fri, 10 Jan 2014 20:27:46 -0500 Received: from mail-pb0-f51.google.com ([209.85.160.51]:32789 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983AbaAKB1p (ORCPT ); Fri, 10 Jan 2014 20:27:45 -0500 Received: by mail-pb0-f51.google.com with SMTP id up15so5157570pbc.38 for ; Fri, 10 Jan 2014 17:27:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=J+IAo/IN3wH8aX7DiMWPVjXNw53OQF2HYZlj1h763m0=; b=npDLjavGwb3hvsX+SaRa2l/fuOrQJoa1lro7JXM9qz+5qqoOHgTmXEEW6oiKVwkyVT yq9nPOK5tOqIiZWiTUpbiwL/af20OTohW9UpIrp2zYGzQhn0lcga0zHyGybRKfJyErAO cQD6WhnXDYGHxtri2aRd8qechbQjhElgMHiImd30MYYqpBT8dn2K1THZgzu+SwHuCBny WxdOBkfdgGLbeY+mZEMtZ+B6PNPsZeecRXGDAhIuc9iN+tnPEZYzKaH4f47/oMbU75L0 O0X1uRkE+sDYfMafN4B+nwKRlVeobQhDQUOhVa9MH3oDIEpNeVyOQLyejHlYdlOwXzgG y+aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=J+IAo/IN3wH8aX7DiMWPVjXNw53OQF2HYZlj1h763m0=; b=Pz0KPcufIJc6hX8aga3v4/UpxJiLlNNWufMMY8AR1225AOUfgCNeZbw5/+WYdQ88Ao 1Hgl0ZWXPNREL5m5RKYheZY/9diVxPHnNF3s1zspwWBIKqL1eiuZ7w+67lEoJ25K7qEY 9Icy1uvXmqP+NVzz9Ta0zZRMvoqeWRSZHysnpdrA2g5JCns7gA03tw5hfmoz9LZHvq1y V5xICg/vbA0htkFvaNx15oTkPCmlgSoPmkLDXgNlqqF+YsywvqU5vBppLZJsS02hf/qA bkT/B1Bj6fwBj2PvfKR8uDbHNufTjgQJ5ihOgUht5BVJYxrDgRnSAUTUbArSWYK4r6iW +xCg== X-Gm-Message-State: ALoCoQmfUVUWYgODh7NkBOwP0vgKd8LfhsON96JjA9RhFN03PD4B45xpyMcrjZrvDS67ysLffUHlAqKiN4MiFeixzQO5ViYeu0la9hGXM8HvhxWvHaX0J/eGsCn4Yq8+f4VdrlacwhgqRT8vA89VEsFiv3c1+PQMDp1HWlSNIaBG4YGjyqS5s/Bu5x5y554Nhi+C62pQ5NubW9nOKrVxwCNFf3D1TRBEhw== X-Received: by 10.66.121.164 with SMTP id ll4mr15651894pab.48.1389403664801; Fri, 10 Jan 2014 17:27:44 -0800 (PST) Received: from localhost ([172.26.52.174]) by mx.google.com with ESMTPSA id qz9sm20480333pbc.3.2014.01.10.17.27.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 Jan 2014 17:27:44 -0800 (PST) Subject: [PATCH v2 08/12] PCI: Remove unused pci_renumber_slot() To: Stephen Hemminger , linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Yu Zhao , Alex Chiang Date: Fri, 10 Jan 2014 18:27:42 -0700 Message-ID: <20140111012742.14505.76364.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140111012339.14505.40203.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140111012339.14505.40203.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Stephen Hemminger My philosophy is unused code is dead code. And dead code is subject to bit rot and is a likely source of bugs. Use it or lose it. This reverts part of f46753c5e354 ("PCI: introduce pci_slot") and d25b7c8d6ba2 ("PCI: rename pci_update_slot_number to pci_renumber_slot"), removing this interface: pci_renumber_slot() [bhelgaas: split to separate patch] Signed-off-by: Stephen Hemminger Signed-off-by: Bjorn Helgaas CC: Alex Chiang Acked-by: Alex Chiang --- drivers/pci/slot.c | 26 -------------------------- include/linux/pci.h | 1 - 2 files changed, 27 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index 448ca562d1f8..7dd62fa9d0bd 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c @@ -320,32 +320,6 @@ err: EXPORT_SYMBOL_GPL(pci_create_slot); /** - * pci_renumber_slot - update %struct pci_slot -> number - * @slot: &struct pci_slot to update - * @slot_nr: new number for slot - * - * The primary purpose of this interface is to allow callers who earlier - * created a placeholder slot in pci_create_slot() by passing a -1 as - * slot_nr, to update their %struct pci_slot with the correct @slot_nr. - */ -void pci_renumber_slot(struct pci_slot *slot, int slot_nr) -{ - struct pci_slot *tmp; - - down_write(&pci_bus_sem); - - list_for_each_entry(tmp, &slot->bus->slots, list) { - WARN_ON(tmp->number == slot_nr); - goto out; - } - - slot->number = slot_nr; -out: - up_write(&pci_bus_sem); -} -EXPORT_SYMBOL_GPL(pci_renumber_slot); - -/** * pci_destroy_slot - decrement refcount for physical PCI slot * @slot: struct pci_slot to decrement * diff --git a/include/linux/pci.h b/include/linux/pci.h index 583348275085..9d860912dd88 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -763,7 +763,6 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr, const char *name, struct hotplug_slot *hotplug); void pci_destroy_slot(struct pci_slot *slot); -void pci_renumber_slot(struct pci_slot *slot, int slot_nr); int pci_scan_slot(struct pci_bus *bus, int devfn); struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn); void pci_device_add(struct pci_dev *dev, struct pci_bus *bus);