luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: amd: Drop superfluous member from struct amd_spi

Browse Source 
The AMD SPI driver stores a pointer to the spi_master in struct amd_spi
so that it can get from the latter to the former in amd_spi_fifo_xfer().

It's simpler to just pass the pointer from the sole caller
amd_spi_master_transfer() and drop the pointer from struct amd_spi.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Link: https://lore.kernel.org/r/a088b684ad292faf3bd036e51529e608e5c94638.1588590210.git.lukas@wunner.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Lukas Wunner 2020-05-04 13:12:05 +02:00 committed by Mark Brown
parent 7b9c94bd13
commit 36c72a58d4
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi-amd.c
View File

@ -38,7 +38,6 @@ struct amd_spi {
void __iomem *io_remap_addr; void __iomem *io_remap_addr;
unsigned long io_base_addr; unsigned long io_base_addr;
u32 rom_addr; u32 rom_addr;
struct spi_master *master;
u8 chip_select; u8 chip_select;
}; };
@ -164,9 +163,9 @@ static int amd_spi_master_setup(struct spi_device *spi)
} }
static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi, static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi,
struct spi_master *master,
struct spi_message *message) struct spi_message *message)
{ {
struct spi_master *master = amd_spi->master;
struct spi_transfer *xfer = NULL; struct spi_transfer *xfer = NULL;
u8 cmd_opcode; u8 cmd_opcode;
u8 *buf = NULL; u8 *buf = NULL;
@ -241,7 +240,7 @@ static int amd_spi_master_transfer(struct spi_master *master,
* Extract spi_transfers from the spi message and * Extract spi_transfers from the spi message and
* program the controller. * program the controller.
*/ */
amd_spi_fifo_xfer(amd_spi, msg); amd_spi_fifo_xfer(amd_spi, master, msg);
return 0; return 0;
} }
@ -262,7 +261,6 @@ static int amd_spi_probe(struct platform_device *pdev)
} }
amd_spi = spi_master_get_devdata(master); amd_spi = spi_master_get_devdata(master);
amd_spi->master = master;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
amd_spi->io_remap_addr = devm_ioremap_resource(&pdev->dev, res); amd_spi->io_remap_addr = devm_ioremap_resource(&pdev->dev, res);