github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-17 04:50:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'ib-iio-i2c-5.13rc1' into togreg

Browse Source 
Adds a stub needed to resolve a build conflict for the
fxls8962af driver.
This commit is contained in:
Jonathan Cameron 2021-06-07 09:20:02 +01:00
commit 41340965b4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/i2c.h
View File

@ -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.