diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-06-07 09:20:02 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-06-07 09:20:02 +0100 |
| commit | 41340965b4f8055f975f73e1e3d23eff8038f013 (patch) | |
| tree | 47e735aae5e56bdcb384fb98514bf21f8a2ac21f /include/linux | |
| parent | 9654c414bfdca1a62d17e8ae1085a5a2703b6a89 (diff) | |
| parent | aa5c8b25392800bbefa82dd19eeff8ebbf261ace (diff) | |
Merge branch 'ib-iio-i2c-5.13rc1' into togreg
Adds a stub needed to resolve a build conflict for the
fxls8962af driver.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i2c.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index e8f2ac8c9c3d..7d71131c394e 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -343,7 +343,6 @@ struct i2c_client { }; #define to_i2c_client(d) container_of(d, struct i2c_client, dev) -struct i2c_client *i2c_verify_client(struct device *dev); struct i2c_adapter *i2c_verify_adapter(struct device *dev); const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id, const struct i2c_client *client); @@ -477,6 +476,13 @@ i2c_new_ancillary_device(struct i2c_client *client, u16 default_addr); void i2c_unregister_device(struct i2c_client *client); + +struct i2c_client *i2c_verify_client(struct device *dev); +#else +static inline struct i2c_client *i2c_verify_client(struct device *dev) +{ + return NULL; +} #endif /* I2C */ /* Mainboard arch_initcall() code should register all its I2C devices. |