From patchwork Wed Aug 15 20:40:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1328611 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 74DD6DFFF9 for ; Wed, 15 Aug 2012 20:40:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756178Ab2HOUkx (ORCPT ); Wed, 15 Aug 2012 16:40:53 -0400 Received: from mail-fa0-f74.google.com ([209.85.161.74]:64882 "EHLO mail-fa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755894Ab2HOUku (ORCPT ); Wed, 15 Aug 2012 16:40:50 -0400 Received: by faem1 with SMTP id m1so6125fae.1 for ; Wed, 15 Aug 2012 13:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=YIkVvYfL8LVvFqlpTJwalpKSE47U3uwy69acTJu7CuI=; b=YjSkVwc8M1peEOlrevzHBEXS+DvDS5hDvl1ssOhxhSMm5PN3In9P/QLa1Fqwf+yfi6 MwIyHZsxLQFucwOgnffm0VncnWWBoPNGUkRhjhMjnGzLsB5/8p8iX5e/lJ9ryY8EPa2o vayce+JpFLBLGNUihJBfYzhCThQgk8zKW3D2kPdCEQUWW5IFVRLGikSN7f1Q7DZPmSAT OsrXoJxH/ACAvNsWyqorHrpLylJqVRwgpuiXt3mxVZcLyZMJnAa+V3ZkDGzO4yDY+onT JXeOYTGCdr1jvcqCxIRXG7tEuOAcVn/NKjbB30qJz81U5Bgen3G0U7BP7MWj/RZ8ZhAu r4rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=YIkVvYfL8LVvFqlpTJwalpKSE47U3uwy69acTJu7CuI=; b=oCQJUMWOSrC9vPQonrqjufR9cStNO137Dd3vlXzebT86Uqu0zxyS7YFlkXIL7J5Dp8 ayCZrFjoq7O1nlJYqOpowRZpNT5KivTlAq3oU7jAdOa2HviR+NuR9gjsgKNUuWHl/l6A Kbu/W9IRzy42MqcpwaKNwTVq7SBvxyJZBVv6iY01durLOldGX051+VDrJQwowCYtQTsd g96CwZMeITM4YZbUg2bCefGf5xNJBsh96PUou/D6gnnQFvBVypq3Xc1lCyaAhprJSM+e 28LSOkE7AWYuCP1JKcT/YDhf1MhE8gk58gCMV7G5F8y9SGKgnbOppqSxHbA82QLmZyN3 viww== Received: by 10.14.173.68 with SMTP id u44mr13470718eel.3.1345063248682; Wed, 15 Aug 2012 13:40:48 -0700 (PDT) Received: by 10.14.173.68 with SMTP id u44mr13470713eel.3.1345063248613; Wed, 15 Aug 2012 13:40:48 -0700 (PDT) Received: from hpza9.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id 46si3254390eed.1.2012.08.15.13.40.48 (version=TLSv1/SSLv3 cipher=AES128-SHA); Wed, 15 Aug 2012 13:40:48 -0700 (PDT) Received: from bhelgaas.mtv.corp.google.com (bhelgaas.mtv.corp.google.com [172.18.96.155]) by hpza9.eem.corp.google.com (Postfix) with ESMTP id 46EF65C0060; Wed, 15 Aug 2012 13:40:48 -0700 (PDT) Received: by bhelgaas.mtv.corp.google.com (Postfix, from userid 131485) id 96D3A180680; Wed, 15 Aug 2012 13:40:47 -0700 (PDT) Date: Wed, 15 Aug 2012 14:40:47 -0600 From: Bjorn Helgaas To: Wei Yang Cc: linux-pci@vger.kernel.org, shangw@linux.vnet.ibm.com Subject: Re: [PATCH] pci: cleanup on confusing variable name for pci_create_root_bus Message-ID: <20120815204047.GA18925@google.com> References: <1339398558-2562-1-git-send-email-weiyang@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1339398558-2562-1-git-send-email-weiyang@linux.vnet.ibm.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-Gm-Message-State: ALoCoQmwt3YHWozZf/RVWd/6bl/l4EiMk0hEKydswMufCV5wyx8lY53yWG65JOTi8mYJwqErXU5TbG12UTn50SFff4KjA0TinB8kvXoWFpKqgQ9MCo96xVY3uH+YGpfHWoMJAzXcu1XrKmHL8orp2R4vj6atx1GBunTboa+aMogiRfM/QRMhuudjbH27Mp/vdU6A6pVed6C6erRDpB7hU8HT1elB9T7qFg== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Mon, Jun 11, 2012 at 03:09:18PM +0800, Wei Yang wrote: > Since there are serverail *bridge* in this function, it would be a little > confusion. > > Rename the local variable *bridge* to *host_bridge* for easy reading. > > Signed-off-by: Wei Yang > Reviewed-by: Gavin Shan pci_create_root_bus() has changed somewhat since you posted this patch. I refreshed it and also changed some other occurrences, resulting in the following patch. I'll apply it if it looks OK to you. Bjorn commit a634940588f3469b1efa883db1a8a66c3f84c06c Author: Bjorn Helgaas Date: Wed Aug 15 14:24:25 2012 -0600 PCI: Use "host_bridge" for pci_host_bridge variable names Rename local pci_host_bridge variables from "bridge" to "host_bridge" to distinguish them from PCI-to-PCI bridges. Based-on-patch-by: Wei Yang Signed-off-by: Bjorn Helgaas --- 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/host-bridge.c b/drivers/pci/host-bridge.c index a68dc61..6677528 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -27,12 +27,12 @@ static struct pci_host_bridge *find_pci_host_bridge(struct pci_dev *dev) return to_pci_host_bridge(bus->bridge); } -void pci_set_host_bridge_release(struct pci_host_bridge *bridge, +void pci_set_host_bridge_release(struct pci_host_bridge *host_bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data) { - bridge->release_fn = release_fn; - bridge->release_data = release_data; + host_bridge->release_fn = release_fn; + host_bridge->release_data = release_data; } static bool resource_contains(struct resource *res1, struct resource *res2) @@ -43,11 +43,11 @@ static bool resource_contains(struct resource *res1, struct resource *res2) void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, struct resource *res) { - struct pci_host_bridge *bridge = find_pci_host_bridge(dev); + struct pci_host_bridge *host_bridge = find_pci_host_bridge(dev); struct pci_host_bridge_window *window; resource_size_t offset = 0; - list_for_each_entry(window, &bridge->windows, list) { + list_for_each_entry(window, &host_bridge->windows, list) { if (resource_type(res) != resource_type(window->res)) continue; @@ -71,11 +71,11 @@ static bool region_contains(struct pci_bus_region *region1, void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, struct pci_bus_region *region) { - struct pci_host_bridge *bridge = find_pci_host_bridge(dev); + struct pci_host_bridge *host_bridge = find_pci_host_bridge(dev); struct pci_host_bridge_window *window; resource_size_t offset = 0; - list_for_each_entry(window, &bridge->windows, list) { + list_for_each_entry(window, &host_bridge->windows, list) { struct pci_bus_region bus_region; if (resource_type(res) != resource_type(window->res)) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 6c143b4..5d084b6 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -467,15 +467,15 @@ static struct pci_bus * pci_alloc_bus(void) static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b) { - struct pci_host_bridge *bridge; + struct pci_host_bridge *host_bridge; - bridge = kzalloc(sizeof(*bridge), GFP_KERNEL); - if (bridge) { - INIT_LIST_HEAD(&bridge->windows); - bridge->bus = b; + host_bridge = kzalloc(sizeof(*host_bridge), GFP_KERNEL); + if (host_bridge) { + INIT_LIST_HEAD(&host_bridge->windows); + host_bridge->bus = b; } - return bridge; + return host_bridge; } static unsigned char pcix_bus_speed[] = { @@ -1179,14 +1179,14 @@ int pci_cfg_space_size(struct pci_dev *dev) static void pci_release_bus_bridge_dev(struct device *dev) { - struct pci_host_bridge *bridge = to_pci_host_bridge(dev); + struct pci_host_bridge *host_bridge = to_pci_host_bridge(dev); - if (bridge->release_fn) - bridge->release_fn(bridge); + if (host_bridge->release_fn) + host_bridge->release_fn(host_bridge); - pci_free_resource_list(&bridge->windows); + pci_free_resource_list(&host_bridge->windows); - kfree(bridge); + kfree(host_bridge); } struct pci_dev *alloc_pci_dev(void) @@ -1636,7 +1636,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources) { int error; - struct pci_host_bridge *bridge; + struct pci_host_bridge *host_bridge; struct pci_bus *b, *b2; struct pci_host_bridge_window *window, *n; struct resource *res; @@ -1658,17 +1658,17 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, goto err_out; } - bridge = pci_alloc_host_bridge(b); - if (!bridge) + host_bridge = pci_alloc_host_bridge(b); + if (!host_bridge) goto err_out; - bridge->dev.parent = parent; - bridge->dev.release = pci_release_bus_bridge_dev; - dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); - error = device_register(&bridge->dev); + host_bridge->dev.parent = parent; + host_bridge->dev.release = pci_release_bus_bridge_dev; + dev_set_name(&host_bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); + error = device_register(&host_bridge->dev); if (error) goto bridge_dev_reg_err; - b->bridge = get_device(&bridge->dev); + b->bridge = get_device(&host_bridge->dev); device_enable_async_suspend(b->bridge); pci_set_bus_of_node(b); @@ -1694,7 +1694,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, /* Add initial resources to the bus */ list_for_each_entry_safe(window, n, resources, list) { - list_move_tail(&window->list, &bridge->windows); + list_move_tail(&window->list, &host_bridge->windows); res = window->res; offset = window->offset; if (res->flags & IORESOURCE_BUS) @@ -1721,10 +1721,10 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, return b; class_dev_reg_err: - put_device(&bridge->dev); - device_unregister(&bridge->dev); + put_device(&host_bridge->dev); + device_unregister(&host_bridge->dev); bridge_dev_reg_err: - kfree(bridge); + kfree(host_bridge); err_out: kfree(b); return NULL;