2024-04-17 11:05:37

by Andy Shevchenko

Subject: [PATCH v3 8/9] spi: pxa2xx: Remove timeout field from struct chip_data

The timeout field is used only once and assigned to a predefined
constant. Replace all that by using the constant directly.

Signed-off-by: Andy Shevchenko <[email protected]>
---
drivers/spi/spi-pxa2xx.c | 4 +---
drivers/spi/spi-pxa2xx.h | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 3ba0f5816f7f..030afb17e606 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1058,7 +1058,7 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,
pxa_ssp_disable(drv_data->ssp);

if (!pxa25x_ssp_comp(drv_data))
- pxa2xx_spi_write(drv_data, SSTO, chip->timeout);
+ pxa2xx_spi_write(drv_data, SSTO, TIMOUT_DFLT);

/* First set CR1 without interrupt and service enables */
pxa2xx_spi_update(drv_data, SSCR1, change_mask, cr1);
@@ -1200,8 +1200,6 @@ static int setup(struct spi_device *spi)
chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
if (!chip)
return -ENOMEM;
-
- chip->timeout = TIMOUT_DFLT;
}

chip->cr1 = 0;
diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h
index 10294ef209d9..5f741bb30240 100644
--- a/drivers/spi/spi-pxa2xx.h
+++ b/drivers/spi/spi-pxa2xx.h
@@ -78,7 +78,6 @@ struct driver_data {
struct chip_data {
u32 cr1;
u32 dds_rate;
- u32 timeout;
u32 threshold;
u16 lpss_rx_threshold;
u16 lpss_tx_threshold;
--
2.43.0.rc1.1336.g36b5255a03ac

2024-05-02 08:14:08

by Linus Walleij

Subject: Re: [PATCH v3 8/9] spi: pxa2xx: Remove timeout field from struct chip_data

On Wed, Apr 17, 2024 at 1:04 PM Andy Shevchenko
<[email protected]> wrote:

> The timeout field is used only once and assigned to a predefined
> constant. Replace all that by using the constant directly.
>
> Signed-off-by: Andy Shevchenko <[email protected]>

Reviewed-by: Linus Walleij <[email protected]>

Yours,
Linus Walleij