On 1/7/20 2:15 PM, Arnd Bergmann wrote:
> While fixing another issue in this driver I noticed it uses
> IS_ERR_OR_NULL(), which is almost always a mistake.
>
> Change the driver to use the proper devm_reset_control_get_optional()
> interface instead and remove the checks except for the one that
> checks for a failure in that function.
>
> Fixes: 2b2c47d9e1fe ("ata: ahci_brcm: Allow optional reset controller to be used")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
This is nearly equivalent to:
https://lore.kernel.org/lkml/20200107183022.26224-2-f.fainelli@xxxxxxxxx/
which was just submitted this morning. Thanks!
> ---
> drivers/ata/ahci_brcm.c | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
> index 239333d11b88..7ac1141c6ad0 100644
> --- a/drivers/ata/ahci_brcm.c
> +++ b/drivers/ata/ahci_brcm.c
> @@ -352,8 +352,7 @@ static int brcm_ahci_suspend(struct device *dev)
> else
> ret = 0;
>
> - if (!IS_ERR_OR_NULL(priv->rcdev))
> - reset_control_assert(priv->rcdev);
> + reset_control_assert(priv->rcdev);
>
> return ret;
> }
> @@ -365,8 +364,7 @@ static int __maybe_unused brcm_ahci_resume(struct device *dev)
> struct brcm_ahci_priv *priv = hpriv->plat_data;
> int ret = 0;
>
> - if (!IS_ERR_OR_NULL(priv->rcdev))
> - ret = reset_control_deassert(priv->rcdev);
> + ret = reset_control_deassert(priv->rcdev);
> if (ret)
> return ret;
>
> @@ -454,9 +452,11 @@ static int brcm_ahci_probe(struct platform_device *pdev)
> else
> reset_name = "ahci";
>
> - priv->rcdev = devm_reset_control_get(&pdev->dev, reset_name);
> - if (!IS_ERR_OR_NULL(priv->rcdev))
> - reset_control_deassert(priv->rcdev);
> + priv->rcdev = devm_reset_control_get_optional(&pdev->dev, reset_name);
> + if (IS_ERR(priv->rcdev))
> + return PTR_ERR(priv->rcdev);
> +
> + reset_control_deassert(priv->rcdev);
>
> hpriv = ahci_platform_get_resources(pdev, 0);
> if (IS_ERR(hpriv)) {
> @@ -520,8 +520,7 @@ static int brcm_ahci_probe(struct platform_device *pdev)
> out_disable_clks:
> ahci_platform_disable_clks(hpriv);
> out_reset:
> - if (!IS_ERR_OR_NULL(priv->rcdev))
> - reset_control_assert(priv->rcdev);
> + reset_control_assert(priv->rcdev);
> return ret;
> }
>
>
--
Florian
