lkml.org 
[lkml]   [2010]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 4/5]pci:setup_bus.c Fix warning: variable 'retval' set but not used
    On 06/18/2010 12:49 PM, Jesse Barnes wrote:
    > On Fri, 18 Jun 2010 11:48:29 -0700
    > Yinghai Lu<yinghai@kernel.org> wrote:
    >
    >> On 06/18/2010 10:23 AM, Jesse Barnes wrote:
    >>> On Tue, 15 Jun 2010 22:33:53 -0700
    >>> "Justin P. Mattock"<justinmattock@gmail.com> wrote:
    >>>
    >>>> The below patch fixes a warning message when using gcc 4.6.0
    >>>> CC drivers/pci/setup-bus.o
    >>>> drivers/pci/setup-bus.c: In function 'pci_assign_unassigned_bridge_resources':
    >>>> drivers/pci/setup-bus.c:868:6: warning: variable 'retval' set but not used
    >>>>
    >>>> Signed-off-by: Justin P. Mattock<justinmattock@gmail.com>
    >>>>
    >>>> ---
    >>>> drivers/pci/setup-bus.c | 2 --
    >>>> 1 files changed, 0 insertions(+), 2 deletions(-)
    >>>>
    >>>> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
    >>>> index 19b1113..215590b 100644
    >>>> --- a/drivers/pci/setup-bus.c
    >>>> +++ b/drivers/pci/setup-bus.c
    >>>> @@ -865,7 +865,6 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
    >>>> struct pci_bus *parent = bridge->subordinate;
    >>>> int tried_times = 0;
    >>>> struct resource_list_x head, *list;
    >>>> - int retval;
    >>>> unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
    >>>> IORESOURCE_PREFETCH;
    >>>>
    >>>> @@ -874,7 +873,6 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
    >>>> again:
    >>>> pci_bus_size_bridges(parent);
    >>>> __pci_bridge_assign_resources(bridge,&head);
    >>>> - retval = pci_reenable_device(bridge);
    >>>> pci_set_master(bridge);
    >>>> pci_enable_bridges(parent);
    >>>>
    >>
    >> I sent following patch several weeks ago, can you put that in pci-next?
    >>
    >> Subject: [PATCH] pciehp: Enable bridges at last for multiple try assigning
    >>
    >> Found one PCIe Module with several bridges "cold" hotadd doesn't work.
    >>
    >> the root cause:
    >> 1. BIOS assign small range the parent bridges.
    >> 2. First try for hotadd only can make some bridges get resource assigned.
    >> 3. Second will update parent bridge res, get right sizes for all child bridges
    >> and devices, but resource for child bridges are not set to HW register.
    >> Because first try already enable those bridges, so __pci_bridge_assign_resource
    >> skip the setting step.
    >>
    >> So try to move enabling of child bridges to last and only do that one time
    >>
    >> Signed-off-by: Yinghai Lu<yinghai@kernel.org>
    >
    > Yeah I had a hard time following the changelog, but just looked it
    > over. Looks safe, but Justin will still need to check the return value
    > on pci_reenable_device.
    >
    > Justin, we don't want a message on every reenable, just on ones that
    > fail. So can you protect your printk with if (retval) instead? You'll
    > need to refresh it based on my linux-next branch in a few minutes, as
    > I'm pushing Yinghai's patch now.
    >


    just added this in(as a test), and the retval warning still shows up.
    with the last post I just added a printk was that legit, and if so what
    else might be added to it to make it complete and proper?

    Justin P. Mattock


    \
     
     \ /
      Last update: 2010-06-18 22:01    [W:0.026 / U:32.112 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site