| Message ID | 20220513075554.127677-1-wanjiabing@vivo.com |
|---|---|
| State | New |
| Headers | show |
| Series | ata: Remove unneeded ERROR check before clk_disable_unprepare | expand |
On 5/13/22 10:55 AM, Wan Jiabing wrote: > ERROR check is already in clk_disable() and clk_unprepare() by using > IS_ERR_OR_NULL. Remove unneeded ERROR check for ftide->pclk here. > > Signed-off-by: Wan Jiabing <wanjiabing@vivo.com> Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru> [...] MBR, Sergey
On Fri, May 13, 2022 at 9:56 AM Wan Jiabing <wanjiabing@vivo.com> wrote: > ERROR check is already in clk_disable() and clk_unprepare() by using > IS_ERR_OR_NULL. Remove unneeded ERROR check for ftide->pclk here. > > Signed-off-by: Wan Jiabing <wanjiabing@vivo.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On 2022/05/13 9:55, Wan Jiabing wrote: > ERROR check is already in clk_disable() and clk_unprepare() by using > IS_ERR_OR_NULL. Remove unneeded ERROR check for ftide->pclk here. > > Signed-off-by: Wan Jiabing <wanjiabing@vivo.com> Applied to for-5.19. Thanks !
diff --git a/drivers/ata/pata_ftide010.c b/drivers/ata/pata_ftide010.c index 2e35505b683c..0117df0fe3c5 100644 --- a/drivers/ata/pata_ftide010.c +++ b/drivers/ata/pata_ftide010.c @@ -536,8 +536,8 @@ static int pata_ftide010_probe(struct platform_device *pdev) return 0; err_dis_clk: - if (!IS_ERR(ftide->pclk)) - clk_disable_unprepare(ftide->pclk); + clk_disable_unprepare(ftide->pclk); + return ret; } @@ -547,8 +547,7 @@ static int pata_ftide010_remove(struct platform_device *pdev) struct ftide010 *ftide = host->private_data; ata_host_detach(ftide->host); - if (!IS_ERR(ftide->pclk)) - clk_disable_unprepare(ftide->pclk); + clk_disable_unprepare(ftide->pclk); return 0; }
ERROR check is already in clk_disable() and clk_unprepare() by using IS_ERR_OR_NULL. Remove unneeded ERROR check for ftide->pclk here. Signed-off-by: Wan Jiabing <wanjiabing@vivo.com> --- drivers/ata/pata_ftide010.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)