microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

i2c: acpi: Add i2c_acpi_new_device_by_fwnode() function 

Change i2c_acpi_new_device() into i2c_acpi_new_device_by_fwnode() and
add a static inline wrapper providing the old i2c_acpi_new_device()
behavior.

This is necessary because in some cases we may only have access
to the fwnode / acpi_device and not to the matching physical-node
struct device *.

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211203102857.44539-4-hdegoede@redhat.com
This commit is contained in:
Hans de Goede 2021-12-03 11:28:46 +01:00
Родитель fb90e58f7c
Коммит c537be0bfa
2 изменённых файлов: 24 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

17
drivers/i2c/i2c-core-acpi.c
Просмотреть файл

@ -476,8 +476,8 @@ struct notifier_block i2c_acpi_notifier = {
}; };
/** /**
* i2c_acpi_new_device - Create i2c-client for the Nth I2cSerialBus resource * i2c_acpi_new_device_by_fwnode - Create i2c-client for the Nth I2cSerialBus resource
* @dev: Device owning the ACPI resources to get the client from * @fwnode: fwnode with the ACPI resources to get the client from
* @index: Index of ACPI resource to get * @index: Index of ACPI resource to get
* @info: describes the I2C device; note this is modified (addr gets set) * @info: describes the I2C device; note this is modified (addr gets set)
* Context: can sleep * Context: can sleep
@ -493,15 +493,20 @@ struct notifier_block i2c_acpi_notifier = {
* Returns a pointer to the new i2c-client, or error pointer in case of failure. * Returns a pointer to the new i2c-client, or error pointer in case of failure.
* Specifically, -EPROBE_DEFER is returned if the adapter is not found. * Specifically, -EPROBE_DEFER is returned if the adapter is not found.
*/ */
struct i2c_client *i2c_acpi_new_device(struct device *dev, int index, struct i2c_client *i2c_acpi_new_device_by_fwnode(struct fwnode_handle *fwnode,
struct i2c_board_info *info) int index,
struct i2c_board_info *info)
{ {
struct acpi_device *adev = ACPI_COMPANION(dev);
struct i2c_acpi_lookup lookup; struct i2c_acpi_lookup lookup;
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
struct acpi_device *adev;
LIST_HEAD(resource_list); LIST_HEAD(resource_list);
int ret; int ret;
adev = to_acpi_device_node(fwnode);
if (!adev)
return ERR_PTR(-ENODEV);
memset(&lookup, 0, sizeof(lookup)); memset(&lookup, 0, sizeof(lookup));
lookup.info = info; lookup.info = info;
lookup.device_handle = acpi_device_handle(adev); lookup.device_handle = acpi_device_handle(adev);
@ -523,7 +528,7 @@ struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
return i2c_new_client_device(adapter, info); return i2c_new_client_device(adapter, info);
} }
EXPORT_SYMBOL_GPL(i2c_acpi_new_device); EXPORT_SYMBOL_GPL(i2c_acpi_new_device_by_fwnode);
bool i2c_acpi_waive_d0_probe(struct device *dev) bool i2c_acpi_waive_d0_probe(struct device *dev)
{ {

17
include/linux/i2c.h
Просмотреть файл

@ -1025,8 +1025,9 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
struct acpi_resource_i2c_serialbus **i2c); struct acpi_resource_i2c_serialbus **i2c);
int i2c_acpi_client_count(struct acpi_device *adev); int i2c_acpi_client_count(struct acpi_device *adev);
u32 i2c_acpi_find_bus_speed(struct device *dev); u32 i2c_acpi_find_bus_speed(struct device *dev);
struct i2c_client *i2c_acpi_new_device(struct device *dev, int index, struct i2c_client *i2c_acpi_new_device_by_fwnode(struct fwnode_handle *fwnode,
struct i2c_board_info *info); int index,
struct i2c_board_info *info);
struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle); struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle);
bool i2c_acpi_waive_d0_probe(struct device *dev); bool i2c_acpi_waive_d0_probe(struct device *dev);
#else #else
@ -1043,8 +1044,9 @@ static inline u32 i2c_acpi_find_bus_speed(struct device *dev)
{ {
return 0; return 0;
} }
static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, static inline struct i2c_client *i2c_acpi_new_device_by_fwnode(
int index, struct i2c_board_info *info) struct fwnode_handle *fwnode, int index,
struct i2c_board_info *info)
{ {
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
} }
@ -1058,4 +1060,11 @@ static inline bool i2c_acpi_waive_d0_probe(struct device *dev)
} }
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
static inline struct i2c_client *i2c_acpi_new_device(struct device *dev,
int index,
struct i2c_board_info *info)
{
return i2c_acpi_new_device_by_fwnode(dev_fwnode(dev), index, info);
}
#endif /* _LINUX_I2C_H */ #endif /* _LINUX_I2C_H */