in spi_alloc_master() already exists master_controller_set_devdata()
called, add the struct dw_spi is passed to the spi_alloc_master() as
the second parameter.
Signed-off-by: Lizhe <[email protected]>
---
drivers/spi/spi-dw-core.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c
index c3bfb6c84cab..ad776c7eb66c 100644
--- a/drivers/spi/spi-dw-core.c
+++ b/drivers/spi/spi-dw-core.c
@@ -892,7 +892,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
if (!dws)
return -EINVAL;
- master = spi_alloc_master(dev, 0);
+ master = spi_alloc_master(dev, sizeof(*dws));
if (!master)
return -ENOMEM;
@@ -901,8 +901,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
dws->master = master;
dws->dma_addr = (dma_addr_t)(dws->paddr + DW_SPI_DR);
- spi_controller_set_devdata(master, dws);
-
/* Basic HW init */
dw_spi_hw_init(dev, dws);
--
2.34.1
On Wed, Mar 08, 2023 at 10:55:51PM +0800, Lizhe wrote:
> in spi_alloc_master() already exists master_controller_set_devdata()
> called, add the struct dw_spi is passed to the spi_alloc_master() as
> the second parameter.
Are you sure that the suggested change does what you think it does?
-Serge(y)
>
> Signed-off-by: Lizhe <[email protected]>
> ---
> drivers/spi/spi-dw-core.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c
> index c3bfb6c84cab..ad776c7eb66c 100644
> --- a/drivers/spi/spi-dw-core.c
> +++ b/drivers/spi/spi-dw-core.c
> @@ -892,7 +892,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
> if (!dws)
> return -EINVAL;
>
> - master = spi_alloc_master(dev, 0);
> + master = spi_alloc_master(dev, sizeof(*dws));
> if (!master)
> return -ENOMEM;
>
> @@ -901,8 +901,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
> dws->master = master;
> dws->dma_addr = (dma_addr_t)(dws->paddr + DW_SPI_DR);
>
> - spi_controller_set_devdata(master, dws);
> -
> /* Basic HW init */
> dw_spi_hw_init(dev, dws);
>
> --
> 2.34.1
>