From: Bjorn Helgaas <helgaas@kernel.org>
To: Krzysztof Wilczynski <kw@linux.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org
Subject: Re: [PATCH] PCI: shpchp: Remove surplus variable and ineffectual error check
Date: Thu, 21 May 2020 15:20:44 -0500 [thread overview]
Message-ID: <20200521202044.GA1174339@bjorn-Precision-5520> (raw)
In-Reply-To: <20200521190457.1066600-1-kw@linux.com>
On Thu, May 21, 2020 at 07:04:57PM +0000, Krzysztof Wilczynski wrote:
> Function remove_board() calls shpchp_unconfigure_device() and checks its
> return code for a possible error which is unnecessary as
> shpchp_unconfigure_device() always returns 0.
>
> Also, remove surplus variable that has not been used for anything. This
> will also address the following Coccinelle warning:
>
> drivers/pci/hotplug/shpchp_pci.c:66:5-7: Unneeded variable: "rc".
> Return "0" on line 86
>
> Signed-off-by: Krzysztof Wilczynski <kw@linux.com>
Applied to pci/hotplug for v5.8, thanks!
> ---
> drivers/pci/hotplug/shpchp.h | 2 +-
> drivers/pci/hotplug/shpchp_ctrl.c | 3 +--
> drivers/pci/hotplug/shpchp_pci.c | 5 +----
> 3 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
> index f7f13ee5d06e..6e85885b554c 100644
> --- a/drivers/pci/hotplug/shpchp.h
> +++ b/drivers/pci/hotplug/shpchp.h
> @@ -164,7 +164,7 @@ u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl);
> u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl);
> u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl);
> int shpchp_configure_device(struct slot *p_slot);
> -int shpchp_unconfigure_device(struct slot *p_slot);
> +void shpchp_unconfigure_device(struct slot *p_slot);
> void cleanup_slots(struct controller *ctrl);
> void shpchp_queue_pushbutton_work(struct work_struct *work);
> int shpc_init(struct controller *ctrl, struct pci_dev *pdev);
> diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
> index 078003dcde5b..afdc52d1cae7 100644
> --- a/drivers/pci/hotplug/shpchp_ctrl.c
> +++ b/drivers/pci/hotplug/shpchp_ctrl.c
> @@ -341,8 +341,7 @@ static int remove_board(struct slot *p_slot)
> u8 hp_slot;
> int rc;
>
> - if (shpchp_unconfigure_device(p_slot))
> - return(1);
> + shpchp_unconfigure_device(p_slot);
>
> hp_slot = p_slot->device - ctrl->slot_device_offset;
> p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
> diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
> index 115701301487..36db0c3c4ea6 100644
> --- a/drivers/pci/hotplug/shpchp_pci.c
> +++ b/drivers/pci/hotplug/shpchp_pci.c
> @@ -61,9 +61,8 @@ int shpchp_configure_device(struct slot *p_slot)
> return ret;
> }
>
> -int shpchp_unconfigure_device(struct slot *p_slot)
> +void shpchp_unconfigure_device(struct slot *p_slot)
> {
> - int rc = 0;
> struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;
> struct pci_dev *dev, *temp;
> struct controller *ctrl = p_slot->ctrl;
> @@ -83,6 +82,4 @@ int shpchp_unconfigure_device(struct slot *p_slot)
> }
>
> pci_unlock_rescan_remove();
> - return rc;
> }
> -
> --
> 2.26.2
>
prev parent reply other threads:[~2020-05-21 20:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 19:04 [PATCH] PCI: shpchp: Remove surplus variable and ineffectual error check Krzysztof Wilczynski
2020-05-21 20:20 ` 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=20200521202044.GA1174339@bjorn-Precision-5520 \
--to=helgaas@kernel.org \
--cc=bhelgaas@google.com \
--cc=kw@linux.com \
--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