On 12/23/21 11:30 PM, Sergey Shtylyov wrote:
[...]
>> Merge the OF pata_of_platform driver into pata_platform. While doing so
>> drop usage of platform_get_resource() and use platform_get_irq_optional().
>
> Sounds like you need a separate patch for doing that...
>
>> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
[...]
>> diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
>> index cb3134bf88eb..d1f7f4d65316 100644
>> --- a/drivers/ata/pata_platform.c
>> +++ b/drivers/ata/pata_platform.c
[...]
>> @@ -168,23 +178,81 @@ int __pata_platform_probe(struct device *dev, struct resource *io_res,
> [...]
>> -static int pata_platform_probe(struct platform_device *pdev)
>> +static int pata_of_platform_get_pdata(struct platform_device *ofdev,
>> + struct pata_platform_priv *priv)
>> {
>> + struct device_node *dn = ofdev->dev.of_node;
>> struct resource *io_res;
>> struct resource *ctl_res;
>> struct resource *irq_res;
>> + int pio_mode = 0;
>> + int irq;
>> + int ret;
>> +
>> + io_res = devm_kzalloc(&ofdev->dev, sizeof(*io_res), GFP_KERNEL);
>> + ctl_res = devm_kzalloc(&ofdev->dev, sizeof(*ctl_res), GFP_KERNEL);
>> + irq_res = devm_kzalloc(&ofdev->dev, sizeof(*irq_res), GFP_KERNEL);
>> + if (!io_res || !ctl_res || !irq_res)
>> + return -ENOMEM;
>> +
>> + ret = of_address_to_resource(dn, 0, io_res);
>
> Why not switch to platform_mem_or_io() -- either before or after this patch?
>
>> + if (ret) {
>> + dev_err(&ofdev->dev, "can't get IO address from device tree\n");
>> + return -EINVAL;
>> + }
>> + priv->io_res = io_res;
>> +
>> + ret = of_address_to_resource(dn, 1, ctl_res);
>
> Ditto.
>
>> + if (ret) {
>> + dev_err(&ofdev->dev, "can't get CTL address from device tree\n");
>> + return -EINVAL;
>> + }
>> + priv->ctl_res = ctl_res;
>> +
>> + irq = platform_get_irq_optional(ofdev, 0);
>
> Contrariwise, either keep the old code and update it in pata_of_platform before
s/either keep the old code and//.
> this patch or do it after this patch. Otherwise it seems somewhat inconsistent WRT
> the of_address_to_resource() calls which you don't convert...
[...]
MBR, Sergey
