[PATCH v2 7/9] powerpc/eeh: Remove always-true tests in eeh_reset_device()

[Alexey Kardashevskiy]

On 19/3/18 1:49 pm, Sam Bobroff wrote:
> eeh_reset_device() tests the value of 'bus' more than once but the
> only caller, eeh_handle_normal_device() does this test itself and will
> never pass NULL.
> 
> So, remove the dead tests.
> 
> This should not change behaviour.
> 
> Signed-off-by: Sam Bobroff <sam.bobroff at au1.ibm.com>


Reviewed-by: Alexey Kardashevskiy <aik at ozlabs.ru>


> ---
>  arch/powerpc/kernel/eeh_driver.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
> index 07437d765434..93fc22e791fa 100644
> --- a/arch/powerpc/kernel/eeh_driver.c
> +++ b/arch/powerpc/kernel/eeh_driver.c
> @@ -655,7 +655,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
>  			pci_hp_remove_devices(bus);
>  			pci_unlock_rescan_remove();
>  		}
> -	} else if (bus) {
> +	} else {
>  		eeh_pe_dev_traverse(pe, eeh_rmv_device, rmv_data);
>  	}
>  
> @@ -708,7 +708,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
>  			eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
>  			pci_hp_add_devices(bus);
>  		}
> -	} else if (bus && rmv_data->removed) {
> +	} else if (rmv_data->removed) {
>  		pr_info("EEH: Sleep 5s ahead of partial hotplug\n");
>  		ssleep(5);
>  
> 


-- 
Alexey