[PATCH -next] ARM: spear: Fix build error with CONFIG_ARCH_SPEAR3XX

[chenlifu]

在 2021/4/9 12:03, Viresh Kumar 写道:
> On 09-04-21, 09:55, Chen Lifu wrote:
>> commit 77f983a9df42 ("spi: pl022: Use GPIOs looked up by the core")
>> deleted 'struct pl022_ssp_controller' member 'num_chipselect'.
>> We get build error when CONFIG_ARCH_SPEAR3XX is set:
>> arch/arm/mach-spear/spear3xx.c:42:3: error: 'struct pl022_ssp_controller' has no member named 'num_chipselect'
>>     42 |  .num_chipselect = 2,
>>        |   ^~~~~~~~~~~~~~
>> arch/arm/mach-spear/spear3xx.c:42:20: warning: initialization of 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
>>     42 |  .num_chipselect = 2,
>>        |                    ^
>>
>> Fix the issue by deleting the initialization of 'num_chipselect'
>> in spear3xx.c.
>>
>> Fixes: 77f983a9df42 ("spi: pl022: Use GPIOs looked up by the core")
>> Reported-by: Hulk Robot <hulkci at huawei.com>
>> Signed-off-by: Chen Lifu <chenlifu at huawei.com>
>> ---
>>   arch/arm/mach-spear/spear3xx.c | 10 ----------
>>   1 file changed, 10 deletions(-)
>>
>> diff --git a/arch/arm/mach-spear/spear3xx.c b/arch/arm/mach-spear/spear3xx.c
>> index 8537fcffe5a8..f83321d5e353 100644
>> --- a/arch/arm/mach-spear/spear3xx.c
>> +++ b/arch/arm/mach-spear/spear3xx.c
>> @@ -30,16 +30,6 @@ struct pl022_ssp_controller pl022_plat_data = {
>>   	.dma_filter = pl08x_filter_id,
>>   	.dma_tx_param = "ssp0_tx",
>>   	.dma_rx_param = "ssp0_rx",
>> -	/*
>> -	 * This is number of spi devices that can be connected to spi. There are
>> -	 * two type of chipselects on which slave devices can work. One is chip
>> -	 * select provided by spi masters other is controlled through external
>> -	 * gpio's. We can't use chipselect provided from spi master (because as
>> -	 * soon as FIFO becomes empty, CS is disabled and transfer ends). So
>> -	 * this number now depends on number of gpios available for spi. each
>> -	 * slave on each master requires a separate gpio pin.
>> -	 */
>> -	.num_chipselect = 2,
>>   };
> 
> A patch is already applied by Mark to fix this issue.
> 

Thanks.

---
Chen Lifu