On Sun, Sep 07, 2014 at 08:04:28PM +0200, Quentin Lambert wrote:
> The modifications effectively change the value of len_tmp
> in the case where the first condition is not met.
>
> Signed-off-by: Quentin Lambert <[email protected]>
> ---
> drivers/pci/hotplug/ibmphp_res.c | 13 +++++++++----
> drivers/pci/pci.c | 6 +++++-
> drivers/pci/slot.c | 12 ++++++++++--
> 3 files changed, 24 insertions(+), 7 deletions(-)
> ...
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 8b63a5b..4c3ef21 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -4434,9 +4434,13 @@ static int __init pci_setup(char *str)
> {
> while (str) {
> char *k = strchr(str, ',');
> + char tmp = *str;
> +
> if (k)
> *k++ = 0;
> - if (*str && (str = pcibios_setup(str)) && *str) {
> +
> + str = pcibios_setup(str);
> + if (tmp && str && *str) {
I dropped this change because I don't think the replacement is quite
equivalent. Previously, we only called pcibios_setup() if "*str". The new
code calls it even if "!*str".
> if (!strcmp(str, "nomsi")) {
> pci_no_msi();
> } else if (!strcmp(str, "noaer")) {
> diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
> index 396c200..22d20db 100644
> --- a/drivers/pci/slot.c
> +++ b/drivers/pci/slot.c
> @@ -265,8 +265,16 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent,
> int slot_nr,
> slot = get_slot(parent, slot_nr);
> if (slot) {
> if (hotplug) {
> - if ((err = slot->hotplug ? -EBUSY : 0)
> - || (err = rename_slot(slot, name))) {
> + err = slot->hotplug ? -EBUSY : 0;
> + if (err)
> + goto hotplugerror;
> +
> + err = rename_slot(slot, name);
> + if (err)
> + goto hotplugerror;
> +
> + if (0) {
> +hotplugerror:
> kobject_put(&slot->kobj);
> slot = NULL;
> goto err;
And I dropped this one because the code is too ugly. Granted, the
original is probably even uglier, but if we're going to change it, I'm
going to hold out for a prettier restructuring.
Bjorn
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
