[PATCH v8 09/23] ata: libahci_platform: Parse ports-implemented property in resources getter

[Damien Le Moal]

On 9/20/22 06:50, Guenter Roeck wrote:
> On Fri, Sep 09, 2022 at 10:36:07PM +0300, Serge Semin wrote:
>> The ports-implemented property is mainly used on the OF-based platforms
>> with no ports mapping initialized by a bootloader/BIOS firmware. Seeing
>> the same of_property_read_u32()-based pattern has already been implemented
>> in the generic AHCI LLDD (glue) driver and in the Mediatek, St AHCI
>> drivers let's move the property read procedure to the generic
>> ahci_platform_get_resources() method. Thus we'll have the forced ports
>> mapping feature supported for each OF-based platform which requires that,
>> and stop re-implementing the same pattern in there a bit simplifying the
>> code.
>>
>> Signed-off-by: Serge Semin <Sergey.Semin at baikalelectronics.ru>
>> ---
>>  drivers/ata/ahci_mtk.c         | 2 --
>>  drivers/ata/ahci_platform.c    | 3 ---
>>  drivers/ata/ahci_st.c          | 3 ---
>>  drivers/ata/libahci_platform.c | 3 +++
>>  4 files changed, 3 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/ata/ahci_mtk.c b/drivers/ata/ahci_mtk.c
>> index 1f6c85fde983..c056378e3e72 100644
>> --- a/drivers/ata/ahci_mtk.c
>> +++ b/drivers/ata/ahci_mtk.c
>> @@ -118,8 +118,6 @@ static int mtk_ahci_parse_property(struct ahci_host_priv *hpriv,
>>  				   SYS_CFG_SATA_EN);
>>  	}
>>  
>> -	of_property_read_u32(np, "ports-implemented", &hpriv->force_port_map);
>> -
>>  	return 0;
>>  }
>>  
>> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
>> index 28a8de5b48b9..9b56490ecbc3 100644
>> --- a/drivers/ata/ahci_platform.c
>> +++ b/drivers/ata/ahci_platform.c
>> @@ -56,9 +56,6 @@ static int ahci_probe(struct platform_device *pdev)
>>  	if (rc)
>>  		return rc;
>>  
>> -	of_property_read_u32(dev->of_node,
>> -			     "ports-implemented", &hpriv->force_port_map);
>> -
>>  	if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
>>  		hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
>>  
>> diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
>> index 7526653c843b..068621099c00 100644
>> --- a/drivers/ata/ahci_st.c
>> +++ b/drivers/ata/ahci_st.c
>> @@ -168,9 +168,6 @@ static int st_ahci_probe(struct platform_device *pdev)
>>  
>>  	st_ahci_configure_oob(hpriv->mmio);
>>  
>> -	of_property_read_u32(dev->of_node,
>> -			     "ports-implemented", &hpriv->force_port_map);
>> -
> 
> With arm:allmodconfig, this results in:
> 
>   CC [M]  drivers/ata/ahci_st.o
> drivers/ata/ahci_st.c: In function 'st_ahci_probe':
> drivers/ata/ahci_st.c:147:24: error: unused variable 'dev' [-Werror=unused-variable]
>   147 |         struct device *dev = &pdev->dev;
> 
> Guenter

Just pushed a fix for this in ata tree for-next and for-6.1 branches. The
problem should be resolved with the next linux-next merge.

-- 
Damien Le Moal
Western Digital Research