Skip to content

L
linux
Commit aec809fc authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Wolfram Sang
Browse files
Options

i2c: core: Cleanup I2C ACPI namespace, take 2 

I2C ACPI enumeration was originally implemented in another module under
drivers/acpi/ but was later moved into i2c-core with added support for
I2C ACPI operation region.

Rename these acpi_i2c_ prefixed functions, structures and defines in
i2c-core to i2c_acpi_ in order to have more consistent name space.

This is updated version from commit a7003b65 ("i2c: core: Cleanup I2C
ACPI namespace") that got reverted due merge conflicts from
commit 525e6fab ("i2c / ACPI: add support for ACPI reconfigure
notifications").
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent b6e67145
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
drivers/i2c/i2c-core.c
View file @ aec809fc
...@@ -88,7 +88,7 @@ void i2c_transfer_trace_unreg(void) ...@@ -88,7 +88,7 @@ void i2c_transfer_trace_unreg(void)
} }
#if defined(CONFIG_ACPI) #if defined(CONFIG_ACPI)
struct acpi_i2c_handler_data { struct i2c_acpi_handler_data {
struct acpi_connection_info info; struct acpi_connection_info info;
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
}; };
...@@ -103,15 +103,15 @@ struct gsb_buffer { ...@@ -103,15 +103,15 @@ struct gsb_buffer {
}; };
} __packed; } __packed;
struct acpi_i2c_lookup { struct i2c_acpi_lookup {
struct i2c_board_info *info; struct i2c_board_info *info;
acpi_handle adapter_handle; acpi_handle adapter_handle;
acpi_handle device_handle; acpi_handle device_handle;
}; };
static int acpi_i2c_fill_info(struct acpi_resource *ares, void *data) static int i2c_acpi_fill_info(struct acpi_resource *ares, void *data)
{ {
struct acpi_i2c_lookup *lookup = data; struct i2c_acpi_lookup *lookup = data;
struct i2c_board_info *info = lookup->info; struct i2c_board_info *info = lookup->info;
struct acpi_resource_i2c_serialbus *sb; struct acpi_resource_i2c_serialbus *sb;
acpi_status status; acpi_status status;
...@@ -136,13 +136,13 @@ static int acpi_i2c_fill_info(struct acpi_resource *ares, void *data) ...@@ -136,13 +136,13 @@ static int acpi_i2c_fill_info(struct acpi_resource *ares, void *data)
return 1; return 1;
} }
static int acpi_i2c_get_info(struct acpi_device *adev, static int i2c_acpi_get_info(struct acpi_device *adev,
struct i2c_board_info *info, struct i2c_board_info *info,
acpi_handle *adapter_handle) acpi_handle *adapter_handle)
{ {
struct list_head resource_list; struct list_head resource_list;
struct resource_entry *entry; struct resource_entry *entry;
struct acpi_i2c_lookup lookup; struct i2c_acpi_lookup lookup;
int ret; int ret;
if (acpi_bus_get_status(adev) || !adev->status.present || if (acpi_bus_get_status(adev) || !adev->status.present ||
...@@ -159,7 +159,7 @@ static int acpi_i2c_get_info(struct acpi_device *adev, ...@@ -159,7 +159,7 @@ static int acpi_i2c_get_info(struct acpi_device *adev,
/* Look up for I2cSerialBus resource */ /* Look up for I2cSerialBus resource */
INIT_LIST_HEAD(&resource_list); INIT_LIST_HEAD(&resource_list);
ret = acpi_dev_get_resources(adev, &resource_list, ret = acpi_dev_get_resources(adev, &resource_list,
acpi_i2c_fill_info, &lookup); i2c_acpi_fill_info, &lookup);
acpi_dev_free_resource_list(&resource_list); acpi_dev_free_resource_list(&resource_list);
if (ret < 0 || !info->addr) if (ret < 0 || !info->addr)
...@@ -186,7 +186,7 @@ static int acpi_i2c_get_info(struct acpi_device *adev, ...@@ -186,7 +186,7 @@ static int acpi_i2c_get_info(struct acpi_device *adev,
return 0; return 0;
} }
static void acpi_i2c_register_device(struct i2c_adapter *adapter, static void i2c_acpi_register_device(struct i2c_adapter *adapter,
struct acpi_device *adev, struct acpi_device *adev,
struct i2c_board_info *info) struct i2c_board_info *info)
{ {
...@@ -201,7 +201,7 @@ static void acpi_i2c_register_device(struct i2c_adapter *adapter, ...@@ -201,7 +201,7 @@ static void acpi_i2c_register_device(struct i2c_adapter *adapter,
} }
} }
static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level, static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
void *data, void **return_value) void *data, void **return_value)
{ {
struct i2c_adapter *adapter = data; struct i2c_adapter *adapter = data;
...@@ -212,28 +212,28 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level, ...@@ -212,28 +212,28 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level,
if (acpi_bus_get_device(handle, &adev)) if (acpi_bus_get_device(handle, &adev))
return AE_OK; return AE_OK;
if (acpi_i2c_get_info(adev, &info, &adapter_handle)) if (i2c_acpi_get_info(adev, &info, &adapter_handle))
return AE_OK; return AE_OK;
if (adapter_handle != ACPI_HANDLE(&adapter->dev)) if (adapter_handle != ACPI_HANDLE(&adapter->dev))
return AE_OK; return AE_OK;
acpi_i2c_register_device(adapter, adev, &info); i2c_acpi_register_device(adapter, adev, &info);
return AE_OK; return AE_OK;
} }
#define ACPI_I2C_MAX_SCAN_DEPTH 32 #define I2C_ACPI_MAX_SCAN_DEPTH 32
/** /**
* acpi_i2c_register_devices - enumerate I2C slave devices behind adapter * i2c_acpi_register_devices - enumerate I2C slave devices behind adapter
* @adap: pointer to adapter * @adap: pointer to adapter
* *
* Enumerate all I2C slave devices behind this adapter by walking the ACPI * Enumerate all I2C slave devices behind this adapter by walking the ACPI
* namespace. When a device is found it will be added to the Linux device * namespace. When a device is found it will be added to the Linux device
* model and bound to the corresponding ACPI handle. * model and bound to the corresponding ACPI handle.
*/ */
static void acpi_i2c_register_devices(struct i2c_adapter *adap) static void i2c_acpi_register_devices(struct i2c_adapter *adap)
{ {
acpi_status status; acpi_status status;
...@@ -241,14 +241,14 @@ static void acpi_i2c_register_devices(struct i2c_adapter *adap) ...@@ -241,14 +241,14 @@ static void acpi_i2c_register_devices(struct i2c_adapter *adap)
return; return;
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_I2C_MAX_SCAN_DEPTH, I2C_ACPI_MAX_SCAN_DEPTH,
acpi_i2c_add_device, NULL, i2c_acpi_add_device, NULL,
adap, NULL); adap, NULL);
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
dev_warn(&adap->dev, "failed to enumerate I2C slaves\n"); dev_warn(&adap->dev, "failed to enumerate I2C slaves\n");
} }
static int acpi_i2c_match_adapter(struct device *dev, void *data) static int i2c_acpi_match_adapter(struct device *dev, void *data)
{ {
struct i2c_adapter *adapter = i2c_verify_adapter(dev); struct i2c_adapter *adapter = i2c_verify_adapter(dev);
...@@ -258,29 +258,29 @@ static int acpi_i2c_match_adapter(struct device *dev, void *data) ...@@ -258,29 +258,29 @@ static int acpi_i2c_match_adapter(struct device *dev, void *data)
return ACPI_HANDLE(dev) == (acpi_handle)data; return ACPI_HANDLE(dev) == (acpi_handle)data;
} }
static int acpi_i2c_match_device(struct device *dev, void *data) static int i2c_acpi_match_device(struct device *dev, void *data)
{ {
return ACPI_COMPANION(dev) == data; return ACPI_COMPANION(dev) == data;
} }
static struct i2c_adapter *acpi_i2c_find_adapter_by_handle(acpi_handle handle) static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
{ {
struct device *dev; struct device *dev;
dev = bus_find_device(&i2c_bus_type, NULL, handle, dev = bus_find_device(&i2c_bus_type, NULL, handle,
acpi_i2c_match_adapter); i2c_acpi_match_adapter);
return dev ? i2c_verify_adapter(dev) : NULL; return dev ? i2c_verify_adapter(dev) : NULL;
} }
static struct i2c_client *acpi_i2c_find_client_by_adev(struct acpi_device *adev) static struct i2c_client *i2c_acpi_find_client_by_adev(struct acpi_device *adev)
{ {
struct device *dev; struct device *dev;
dev = bus_find_device(&i2c_bus_type, NULL, adev, acpi_i2c_match_device); dev = bus_find_device(&i2c_bus_type, NULL, adev, i2c_acpi_match_device);
return dev ? i2c_verify_client(dev) : NULL; return dev ? i2c_verify_client(dev) : NULL;
} }
static int acpi_i2c_notify(struct notifier_block *nb, unsigned long value, static int i2c_acpi_notify(struct notifier_block *nb, unsigned long value,
void *arg) void *arg)
{ {
struct acpi_device *adev = arg; struct acpi_device *adev = arg;
...@@ -291,20 +291,20 @@ static int acpi_i2c_notify(struct notifier_block *nb, unsigned long value, ...@@ -291,20 +291,20 @@ static int acpi_i2c_notify(struct notifier_block *nb, unsigned long value,
switch (value) { switch (value) {
case ACPI_RECONFIG_DEVICE_ADD: case ACPI_RECONFIG_DEVICE_ADD:
if (acpi_i2c_get_info(adev, &info, &adapter_handle)) if (i2c_acpi_get_info(adev, &info, &adapter_handle))
break; break;
adapter = acpi_i2c_find_adapter_by_handle(adapter_handle); adapter = i2c_acpi_find_adapter_by_handle(adapter_handle);
if (!adapter) if (!adapter)
break; break;
acpi_i2c_register_device(adapter, adev, &info); i2c_acpi_register_device(adapter, adev, &info);
break; break;
case ACPI_RECONFIG_DEVICE_REMOVE: case ACPI_RECONFIG_DEVICE_REMOVE:
if (!acpi_device_enumerated(adev)) if (!acpi_device_enumerated(adev))
break; break;
client = acpi_i2c_find_client_by_adev(adev); client = i2c_acpi_find_client_by_adev(adev);
if (!client) if (!client)
break; break;
...@@ -317,10 +317,10 @@ static int acpi_i2c_notify(struct notifier_block *nb, unsigned long value, ...@@ -317,10 +317,10 @@ static int acpi_i2c_notify(struct notifier_block *nb, unsigned long value,
} }
static struct notifier_block i2c_acpi_notifier = { static struct notifier_block i2c_acpi_notifier = {
.notifier_call = acpi_i2c_notify, .notifier_call = i2c_acpi_notify,
}; };
#else /* CONFIG_ACPI */ #else /* CONFIG_ACPI */
static inline void acpi_i2c_register_devices(struct i2c_adapter *adap) { } static inline void i2c_acpi_register_devices(struct i2c_adapter *adap) { }
extern struct notifier_block i2c_acpi_notifier; extern struct notifier_block i2c_acpi_notifier;
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
...@@ -386,12 +386,12 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client, ...@@ -386,12 +386,12 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
} }
static acpi_status static acpi_status
acpi_i2c_space_handler(u32 function, acpi_physical_address command, i2c_acpi_space_handler(u32 function, acpi_physical_address command,
u32 bits, u64 *value64, u32 bits, u64 *value64,
void *handler_context, void *region_context) void *handler_context, void *region_context)
{ {
struct gsb_buffer *gsb = (struct gsb_buffer *)value64; struct gsb_buffer *gsb = (struct gsb_buffer *)value64;
struct acpi_i2c_handler_data *data = handler_context; struct i2c_acpi_handler_data *data = handler_context;
struct acpi_connection_info *info = &data->info; struct acpi_connection_info *info = &data->info;
struct acpi_resource_i2c_serialbus *sb; struct acpi_resource_i2c_serialbus *sb;
struct i2c_adapter *adapter = data->adapter; struct i2c_adapter *adapter = data->adapter;
...@@ -510,10 +510,10 @@ acpi_i2c_space_handler(u32 function, acpi_physical_address command, ...@@ -510,10 +510,10 @@ acpi_i2c_space_handler(u32 function, acpi_physical_address command,
} }
static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter) static int i2c_acpi_install_space_handler(struct i2c_adapter *adapter)
{ {
acpi_handle handle; acpi_handle handle;
struct acpi_i2c_handler_data *data; struct i2c_acpi_handler_data *data;
acpi_status status; acpi_status status;
if (!adapter->dev.parent) if (!adapter->dev.parent)
...@@ -524,7 +524,7 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter) ...@@ -524,7 +524,7 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
if (!handle) if (!handle)
return -ENODEV; return -ENODEV;
data = kzalloc(sizeof(struct acpi_i2c_handler_data), data = kzalloc(sizeof(struct i2c_acpi_handler_data),
GFP_KERNEL); GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
...@@ -538,7 +538,7 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter) ...@@ -538,7 +538,7 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
status = acpi_install_address_space_handler(handle, status = acpi_install_address_space_handler(handle,
ACPI_ADR_SPACE_GSBUS, ACPI_ADR_SPACE_GSBUS,
&acpi_i2c_space_handler, &i2c_acpi_space_handler,
NULL, NULL,
data); data);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
...@@ -552,10 +552,10 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter) ...@@ -552,10 +552,10 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
return 0; return 0;
} }
static void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter) static void i2c_acpi_remove_space_handler(struct i2c_adapter *adapter)
{ {
acpi_handle handle; acpi_handle handle;
struct acpi_i2c_handler_data *data; struct i2c_acpi_handler_data *data;
acpi_status status; acpi_status status;
if (!adapter->dev.parent) if (!adapter->dev.parent)
...@@ -568,7 +568,7 @@ static void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter) ...@@ -568,7 +568,7 @@ static void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter)
acpi_remove_address_space_handler(handle, acpi_remove_address_space_handler(handle,
ACPI_ADR_SPACE_GSBUS, ACPI_ADR_SPACE_GSBUS,
&acpi_i2c_space_handler); &i2c_acpi_space_handler);
status = acpi_bus_get_private_data(handle, (void **)&data); status = acpi_bus_get_private_data(handle, (void **)&data);
if (ACPI_SUCCESS(status)) if (ACPI_SUCCESS(status))
...@@ -577,10 +577,10 @@ static void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter) ...@@ -577,10 +577,10 @@ static void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter)
acpi_bus_detach_private_data(handle); acpi_bus_detach_private_data(handle);
} }
#else /* CONFIG_ACPI_I2C_OPREGION */ #else /* CONFIG_ACPI_I2C_OPREGION */
static inline void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter) static inline void i2c_acpi_remove_space_handler(struct i2c_adapter *adapter)
{ } { }
static inline int acpi_i2c_install_space_handler(struct i2c_adapter *adapter) static inline int i2c_acpi_install_space_handler(struct i2c_adapter *adapter)
{ return 0; } { return 0; }
#endif /* CONFIG_ACPI_I2C_OPREGION */ #endif /* CONFIG_ACPI_I2C_OPREGION */
...@@ -1752,8 +1752,8 @@ static int i2c_register_adapter(struct i2c_adapter *adap) ...@@ -1752,8 +1752,8 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
/* create pre-declared device nodes */ /* create pre-declared device nodes */
of_i2c_register_devices(adap); of_i2c_register_devices(adap);
acpi_i2c_register_devices(adap); i2c_acpi_register_devices(adap);
acpi_i2c_install_space_handler(adap); i2c_acpi_install_space_handler(adap);
if (adap->nr < __i2c_first_dynamic_bus_num) if (adap->nr < __i2c_first_dynamic_bus_num)
i2c_scan_static_board_info(adap); i2c_scan_static_board_info(adap);
...@@ -1925,7 +1925,7 @@ void i2c_del_adapter(struct i2c_adapter *adap) ...@@ -1925,7 +1925,7 @@ void i2c_del_adapter(struct i2c_adapter *adap)
return; return;
} }
acpi_i2c_remove_space_handler(adap); i2c_acpi_remove_space_handler(adap);
/* Tell drivers about this removal */ /* Tell drivers about this removal */
mutex_lock(&core_lock); mutex_lock(&core_lock);
bus_for_each_drv(&i2c_bus_type, NULL, adap, bus_for_each_drv(&i2c_bus_type, NULL, adap,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7