| Message ID | 20230601054549.10843-20-nikita.shubin@maquefel.me |
|---|---|
| State | New |
| Headers | show |
| Series | ep93xx device tree conversion | expand |
On 6/1/23 14:45, Nikita Shubin wrote: > Drop legacy acquire/release since we are using > pinctrl for this now. Please use full 72 chars lines. > > Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me> Please change the commit title to: ata: pata_ep93xx: remove legacy pinctrl use Also, are the functions ep93xx_ide_acquire_gpio() & ep93xx_ide_release_gpio() used somewhere else ? If not, this patch should remove these functions as well. > --- > drivers/ata/pata_ep93xx.c | 25 ++++++------------------- > 1 file changed, 6 insertions(+), 19 deletions(-) > > diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c > index 8d363bc71342..88cf31000000 100644 > --- a/drivers/ata/pata_ep93xx.c > +++ b/drivers/ata/pata_ep93xx.c > @@ -921,28 +921,18 @@ static int ep93xx_pata_probe(struct platform_device *pdev) > void __iomem *ide_base; > int err; > > - err = ep93xx_ide_acquire_gpio(pdev); > - if (err) > - return err; > - > /* INT[3] (IRQ_EP93XX_EXT3) line connected as pull down */ > irq = platform_get_irq(pdev, 0); > - if (irq < 0) { > - err = irq; > - goto err_rel_gpio; > - } > + if (irq < 0) > + return irq; > > ide_base = devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res); > - if (IS_ERR(ide_base)) { > - err = PTR_ERR(ide_base); > - goto err_rel_gpio; > - } > + if (IS_ERR(ide_base)) > + return PTR_ERR(ide_base); > > drv_data = devm_kzalloc(&pdev->dev, sizeof(*drv_data), GFP_KERNEL); > - if (!drv_data) { > - err = -ENXIO; > - goto err_rel_gpio; > - } > + if (!drv_data) > + return -ENXIO; > > drv_data->pdev = pdev; > drv_data->ide_base = ide_base; > @@ -1000,8 +990,6 @@ static int ep93xx_pata_probe(struct platform_device *pdev) > > err_rel_dma: > ep93xx_pata_release_dma(drv_data); > -err_rel_gpio: > - ep93xx_ide_release_gpio(pdev); > return err; > } > > @@ -1013,7 +1001,6 @@ static int ep93xx_pata_remove(struct platform_device *pdev) > ata_host_detach(host); > ep93xx_pata_release_dma(drv_data); > ep93xx_pata_clear_regs(drv_data->ide_base); > - ep93xx_ide_release_gpio(pdev); > return 0; > } >
Thu, Jun 01, 2023 at 08:45:43AM +0300, Nikita Shubin kirjoitti: > Drop legacy acquire/release since we are using > pinctrl for this now. ... > drv_data = devm_kzalloc(&pdev->dev, sizeof(*drv_data), GFP_KERNEL); > - if (!drv_data) { > - err = -ENXIO; Wondering why it's not ENOMEM even in the original code? > - goto err_rel_gpio; > - } > + if (!drv_data) > + return -ENXIO;
On 6/2/23 10:52, andy.shevchenko@gmail.com wrote: > Thu, Jun 01, 2023 at 08:45:43AM +0300, Nikita Shubin kirjoitti: >> Drop legacy acquire/release since we are using >> pinctrl for this now. > > ... > >> drv_data = devm_kzalloc(&pdev->dev, sizeof(*drv_data), GFP_KERNEL); >> - if (!drv_data) { >> - err = -ENXIO; > > Wondering why it's not ENOMEM even in the original code? Indeed... > >> - goto err_rel_gpio; >> - } >> + if (!drv_data) >> + return -ENXIO; >
On 6/1/23 8:45 AM, Nikita Shubin wrote: > Drop legacy acquire/release since we are using > pinctrl for this now. > > Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me> Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru> [...] MBR, Sergey
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c index 8d363bc71342..88cf31000000 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c @@ -921,28 +921,18 @@ static int ep93xx_pata_probe(struct platform_device *pdev) void __iomem *ide_base; int err; - err = ep93xx_ide_acquire_gpio(pdev); - if (err) - return err; - /* INT[3] (IRQ_EP93XX_EXT3) line connected as pull down */ irq = platform_get_irq(pdev, 0); - if (irq < 0) { - err = irq; - goto err_rel_gpio; - } + if (irq < 0) + return irq; ide_base = devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res); - if (IS_ERR(ide_base)) { - err = PTR_ERR(ide_base); - goto err_rel_gpio; - } + if (IS_ERR(ide_base)) + return PTR_ERR(ide_base); drv_data = devm_kzalloc(&pdev->dev, sizeof(*drv_data), GFP_KERNEL); - if (!drv_data) { - err = -ENXIO; - goto err_rel_gpio; - } + if (!drv_data) + return -ENXIO; drv_data->pdev = pdev; drv_data->ide_base = ide_base; @@ -1000,8 +990,6 @@ static int ep93xx_pata_probe(struct platform_device *pdev) err_rel_dma: ep93xx_pata_release_dma(drv_data); -err_rel_gpio: - ep93xx_ide_release_gpio(pdev); return err; } @@ -1013,7 +1001,6 @@ static int ep93xx_pata_remove(struct platform_device *pdev) ata_host_detach(host); ep93xx_pata_release_dma(drv_data); ep93xx_pata_clear_regs(drv_data->ide_base); - ep93xx_ide_release_gpio(pdev); return 0; }
Drop legacy acquire/release since we are using pinctrl for this now. Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me> --- drivers/ata/pata_ep93xx.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-)