diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-01-19 09:26:43 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-01-19 09:26:43 +0100 |
commit | 38dd0a5579e15bee6d890d3a232da29574a49083 (patch) | |
tree | 374877c6fbf8a7f421a5ecd3df8956a7c8b2c1f6 /include | |
parent | e83a55ba65b820232cb7e700a36428ba0f2cb6e9 (diff) | |
parent | 0bd13cc61b2124d430efceb998167b06d4471eab (diff) | |
download | barebox-38dd0a5579e15bee6d890d3a232da29574a49083.tar.gz barebox-38dd0a5579e15bee6d890d3a232da29574a49083.tar.xz |
Merge branch 'for-next/ssd1307'
Diffstat (limited to 'include')
-rw-r--r-- | include/i2c/i2c.h | 5 | ||||
-rw-r--r-- | include/spi/spi.h | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/i2c/i2c.h b/include/i2c/i2c.h index af6287602c..7207b1180e 100644 --- a/include/i2c/i2c.h +++ b/include/i2c/i2c.h @@ -333,9 +333,14 @@ static inline int i2c_driver_register(struct driver_d *drv) return register_driver(drv); } +#ifdef CONFIG_I2C #define coredevice_i2c_driver(drv) \ register_driver_macro(coredevice, i2c, drv) #define device_i2c_driver(drv) \ register_driver_macro(device, i2c, drv) +#else +#define coredevice_i2c_driver(drv) +#define device_i2c_driver(drv) +#endif #endif /* I2C_I2C_H */ diff --git a/include/spi/spi.h b/include/spi/spi.h index c5efca1cc3..c5ad6bd39f 100644 --- a/include/spi/spi.h +++ b/include/spi/spi.h @@ -108,6 +108,11 @@ struct spi_device { */ }; +static inline struct spi_device *to_spi_device(struct device_d *dev) +{ + return dev ? container_of(dev, struct spi_device, dev) : NULL; +} + struct spi_message; /** @@ -515,9 +520,14 @@ static inline int spi_driver_register(struct driver_d *drv) return register_driver(drv); } +#ifdef CONFIG_SPI #define coredevice_spi_driver(drv) \ register_driver_macro(coredevice,spi,drv) #define device_spi_driver(drv) \ register_driver_macro(device,spi,drv) +#else +#define coredevice_spi_driver(drv) +#define device_spi_driver(drv) +#endif #endif /* __INCLUDE_SPI_H */ |