Unverified Commit c222ea5d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

staging: fbtft: Deduplicate driver registration macros 

The two macros FBTFT_REGISTER_DRIVER and FBTFT_REGISTER_SPI_DRIVER
contain quite some duplication: Both define an spi driver and an of device
table and the differences are quite subtle.

So create two new macros and use both twice.

Link: https://lore.kernel.org/r/20220118181338.207943-2-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220123175201.34839-3-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7d8e4c98

drivers/staging/fbtft/fbtft.h

+36 −57
Original line number Diff line number Diff line
@@ -272,7 +272,14 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...); 
void fbtft_write_reg16_bus8(struct fbtft_par *par, int len, ...);

void fbtft_write_reg16_bus16(struct fbtft_par *par, int len, ...);



#define FBTFT_REGISTER_DRIVER(_name, _compatible, _display)                \

#define FBTFT_DT_TABLE(_compatible)						\

static const struct of_device_id dt_ids[] = {					\

	{ .compatible = _compatible },						\

	{},									\

};										\

MODULE_DEVICE_TABLE(of, dt_ids);



#define FBTFT_SPI_DRIVER(_name, _compatible, _display, _spi_ids)		\

										\

static int fbtft_driver_probe_spi(struct spi_device *spi)			\

{										\
@@ -287,6 +294,18 @@ static int fbtft_driver_remove_spi(struct spi_device *spi) \ 
	return 0;								\

}										\

										\

static struct spi_driver fbtft_driver_spi_driver = {				\

	.driver = {								\

		.name = _name,							\

		.of_match_table = dt_ids,					\

	},									\

	.id_table = _spi_ids,							\

	.probe = fbtft_driver_probe_spi,					\

	.remove = fbtft_driver_remove_spi,					\

};



#define FBTFT_REGISTER_DRIVER(_name, _compatible, _display)                \

									   \

static int fbtft_driver_probe_pdev(struct platform_device *pdev)           \

{                                                                          \

	return fbtft_probe_common(_display, NULL, pdev);                   \
@@ -300,22 +319,9 @@ static int fbtft_driver_remove_pdev(struct platform_device *pdev) \ 
	return 0;                                                          \

}                                                                          \

									   \

static const struct of_device_id dt_ids[] = {                              \

	{ .compatible = _compatible },                                     \

	{},                                                                \

};                                                                         \

									   \

MODULE_DEVICE_TABLE(of, dt_ids);                                           \

FBTFT_DT_TABLE(_compatible)						   \

									   \

									   \

static struct spi_driver fbtft_driver_spi_driver = {                       \

	.driver = {                                                        \

		.name   = _name,                                           \

		.of_match_table = dt_ids,                                  \

	},                                                                 \

	.probe  = fbtft_driver_probe_spi,                                  \

	.remove = fbtft_driver_remove_spi,                                 \

};                                                                         \

FBTFT_SPI_DRIVER(_name, _compatible, _display, NULL)			   \

									   \

static struct platform_driver fbtft_driver_platform_driver = {             \

	.driver = {                                                        \
@@ -351,42 +357,15 @@ module_exit(fbtft_driver_module_exit); 


#define FBTFT_REGISTER_SPI_DRIVER(_name, _comp_vend, _comp_dev, _display)	\

										\

static int fbtft_driver_probe_spi(struct spi_device *spi)			\

{										\

	return fbtft_probe_common(_display, spi, NULL);				\

}										\

										\

static int fbtft_driver_remove_spi(struct spi_device *spi)			\

{										\

	struct fb_info *info = spi_get_drvdata(spi);				\

										\

	fbtft_remove_common(&spi->dev, info);					\

	return 0;								\

}										\

										\

static const struct of_device_id dt_ids[] = {					\

	{ .compatible = _comp_vend "," _comp_dev },				\

	{},									\

};										\

										\

MODULE_DEVICE_TABLE(of, dt_ids);						\

FBTFT_DT_TABLE(_comp_vend "," _comp_dev)					\

										\

static const struct spi_device_id spi_ids[] = {					\

	{ .name = _comp_dev },							\

	{},									\

};										\

										\

MODULE_DEVICE_TABLE(spi, spi_ids);						\

										\

static struct spi_driver fbtft_driver_spi_driver = {				\

	.driver = {								\

		.name  = _name,							\

		.of_match_table = dt_ids,					\

	},									\

	.id_table = spi_ids,							\

	.probe  = fbtft_driver_probe_spi,					\

	.remove = fbtft_driver_remove_spi,					\

};										\

FBTFT_SPI_DRIVER(_name, _comp_vend "," _comp_dev, _display, spi_ids)		\

										\

module_spi_driver(fbtft_driver_spi_driver);