linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bjorn Helgaas <bhelgaas@google.com>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-pci@vger.kernel.org
Subject: Re: [PATCH] cpqphp_ctrl: remove unreachable path
Date: Mon, 10 Sep 2012 16:47:36 -0600	[thread overview]
Message-ID: <CAErSpo5c8y8mO7QAUr2tUn-SAMhzcbaC4secHzw1k--uUoK60A@mail.gmail.com> (raw)
In-Reply-To: <20120904143946.25201.77305.stgit@localhost.localdomain>

On Tue, Sep 4, 2012 at 8:39 AM, Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> From: Alan Cox <alan@linux.intel.com>
>
> register & 0x0B == 0x04 is never true, the code will always take the
> (identical) 0x00 path anyway. Remove the dead code paths.
>
> Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=44151
> Signed-off-by: Alan Cox <alan@linux.intel.com>

Applied to my "pci/trivial" branch, thanks!

Bjorn

> ---
>
>  drivers/pci/hotplug/cpqphp_ctrl.c |   21 +--------------------
>  1 file changed, 1 insertion(+), 20 deletions(-)
>
> diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
> index e43908d..36112fe 100644
> --- a/drivers/pci/hotplug/cpqphp_ctrl.c
> +++ b/drivers/pci/hotplug/cpqphp_ctrl.c
> @@ -2890,27 +2890,8 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
>                                                 func->mem_head = mem_node;
>                                         } else
>                                                 return -ENOMEM;
> -                               } else if ((temp_register & 0x0BL) == 0x04) {
> -                                       /* Map memory */
> -                                       base = temp_register & 0xFFFFFFF0;
> -                                       base = ~base + 1;
> -
> -                                       dbg("CND:      length = 0x%x\n", base);
> -                                       mem_node = get_resource(&(resources->mem_head), base);
> -
> -                                       /* allocate the resource to the board */
> -                                       if (mem_node) {
> -                                               base = mem_node->base;
> -
> -                                               mem_node->next = func->mem_head;
> -                                               func->mem_head = mem_node;
> -                                       } else
> -                                               return -ENOMEM;
> -                               } else if ((temp_register & 0x0BL) == 0x06) {
> -                                       /* Those bits are reserved, we can't handle this */
> -                                       return 1;
>                                 } else {
> -                                       /* Requesting space below 1M */
> +                                       /* Reserved bits or requesting space below 1M */
>                                         return NOT_ENOUGH_RESOURCES;
>                                 }
>
>
> --
> 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

      reply	other threads:[~2012-09-10 22:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-04 14:39 [PATCH] cpqphp_ctrl: remove unreachable path Alan Cox
2012-09-10 22:47 ` Bjorn Helgaas [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAErSpo5c8y8mO7QAUr2tUn-SAMhzcbaC4secHzw1k--uUoK60A@mail.gmail.com \
    --to=bhelgaas@google.com \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=linux-pci@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).