Unverified Commit 79567c1a authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Mark Brown
Browse files

spi: gpio: Use devm_spi_register_master() 



Replace spi_bitbang_start() with a combination of spi_bitbang_init()
and devm_spi_register_master() and drop all of the explicit
cleanup-related code that's no longer necessary.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-spi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 45beec35

drivers/spi/spi-gpio.c

+4 −15
Original line number Diff line number Diff line
@@ -396,8 +396,6 @@ static int spi_gpio_probe(struct platform_device *pdev) 


	spi_gpio = spi_master_get_devdata(master);



	platform_set_drvdata(pdev, spi_gpio);



	status = spi_gpio_request(dev, spi_gpio);

	if (status)

		return status;
@@ -437,19 +435,11 @@ static int spi_gpio_probe(struct platform_device *pdev) 
	}

	bb->setup_transfer = spi_bitbang_setup_transfer;



	return spi_bitbang_start(&spi_gpio->bitbang);

}



static int spi_gpio_remove(struct platform_device *pdev)

{

	struct spi_gpio			*spi_gpio;



	spi_gpio = platform_get_drvdata(pdev);



	/* stop() unregisters child devices too */

	spi_bitbang_stop(&spi_gpio->bitbang);

	status = spi_bitbang_init(&spi_gpio->bitbang);

	if (status)

		return status;



	return 0;

	return devm_spi_register_master(&pdev->dev, spi_master_get(master));

}



MODULE_ALIAS("platform:" DRIVER_NAME);
@@ -460,7 +450,6 @@ static struct platform_driver spi_gpio_driver = { 
		.of_match_table = of_match_ptr(spi_gpio_dt_ids),

	},

	.probe		= spi_gpio_probe,

	.remove		= spi_gpio_remove,

};

module_platform_driver(spi_gpio_driver);

CRA Git | Maintained and supported by SUSTech CRA and CCSE