diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-30 11:27:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-30 11:27:47 -0700 |
| commit | 3b87cc6feccbf472402e4733120e86fb2233ed5c (patch) | |
| tree | 094c96a73b79de2cc982c4209b5b865c21429bb5 /include/linux/i2c.h | |
| parent | 517f4c49aafce3d2c3ac54ae0bb36f2c76e57fe8 (diff) | |
| parent | 7ce236fafd0b4e279abf3e8b15ba9ad3e49d1440 (diff) | |
Merge branch 'Enable-SFP-on-ACPI-based-systems'
Ruslan Babayev says:
====================
Enable SFP on ACPI based systems
Changes:
v2:
- more descriptive commit body
v3:
- made 'i2c_acpi_find_adapter_by_handle' static inline
v4:
- don't initialize i2c_adapter to NULL. Instead see below...
- handle the case of neither DT nor ACPI present as invalid.
- alphabetical includes.
- use has_acpi_companion().
- use the same argument name in i2c_acpi_find_adapter_by_handle()
in both stubbed and non-stubbed cases.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/i2c.h')
| -rw-r--r-- | include/linux/i2c.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 1308126fc384..e982b8913b73 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -14,6 +14,7 @@ #ifndef _LINUX_I2C_H #define _LINUX_I2C_H +#include <linux/acpi.h> /* for acpi_handle */ #include <linux/mod_devicetable.h> #include <linux/device.h> /* for struct device */ #include <linux/sched.h> /* for completion */ @@ -981,6 +982,7 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, u32 i2c_acpi_find_bus_speed(struct device *dev); struct i2c_client *i2c_acpi_new_device(struct device *dev, int index, struct i2c_board_info *info); +struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle); #else static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, struct acpi_resource_i2c_serialbus **i2c) @@ -996,6 +998,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, { return NULL; } +static inline struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle) +{ + return NULL; +} #endif /* CONFIG_ACPI */ #endif /* _LINUX_I2C_H */ |