Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1b18ea8 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

spi: octeon: Remove my_master pointer from struct octeon_spi 



Pass master to platform_set_drvdata() then we can remove my_master pointer.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent c095ba72

drivers/spi/spi-octeon.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ 
#define OCTEON_SPI_MAX_CLOCK_HZ 16000000

#define OCTEON_SPI_MAX_CLOCK_HZ 16000000





struct octeon_spi {

struct octeon_spi {

	struct spi_master *my_master;

	u64 register_base;

	u64 register_base;

	u64 last_cfg;

	u64 last_cfg;

	u64 cs_enax;

	u64 cs_enax;
@@ -268,7 +267,6 @@ static int octeon_spi_nop_transfer_hardware(struct spi_master *master) 




static int octeon_spi_probe(struct platform_device *pdev)

static int octeon_spi_probe(struct platform_device *pdev)

{

{



	struct resource *res_mem;

	struct resource *res_mem;

	struct spi_master *master;

	struct spi_master *master;

	struct octeon_spi *p;

	struct octeon_spi *p;
@@ -278,8 +276,7 @@ static int octeon_spi_probe(struct platform_device *pdev) 
	if (!master)

	if (!master)

		return -ENOMEM;

		return -ENOMEM;

	p = spi_master_get_devdata(master);

	p = spi_master_get_devdata(master);

	platform_set_drvdata(pdev, p);

	platform_set_drvdata(pdev, master);

	p->my_master = master;





	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -328,10 +325,11 @@ static int octeon_spi_probe(struct platform_device *pdev) 




static int octeon_spi_remove(struct platform_device *pdev)

static int octeon_spi_remove(struct platform_device *pdev)

{

{

	struct octeon_spi *p = platform_get_drvdata(pdev);

	struct spi_master *master = platform_get_drvdata(pdev);

	struct octeon_spi *p = spi_master_get_devdata(master);

	u64 register_base = p->register_base;

	u64 register_base = p->register_base;





	spi_unregister_master(p->my_master);

	spi_unregister_master(master);





	/* Clear the CSENA* and put everything in a known state. */

	/* Clear the CSENA* and put everything in a known state. */

	cvmx_write_csr(register_base + OCTEON_SPI_CFG, 0);

	cvmx_write_csr(register_base + OCTEON_SPI_CFG, 0);