nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

i2c: core: Cleanup I2C ACPI namespace

Browse source 
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.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Jarkko Nikula 2016-06-06 14:26:21 +03:00 committed by Wolfram Sang
parent 44239a5afd
commit a7003b6580
1 changed files with 27 additions and 27 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

54
drivers/i2c/i2c-core.c
View file

@ -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 {
}; };
} __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_find_address(struct acpi_resource *ares, void *data) static int i2c_acpi_find_address(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_handle adapter_handle; acpi_handle adapter_handle;
@ -140,12 +140,12 @@ static int acpi_i2c_find_address(struct acpi_resource *ares, void *data)
return 1; return 1;
} }
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;
struct list_head resource_list; struct list_head resource_list;
struct acpi_i2c_lookup lookup; struct i2c_acpi_lookup lookup;
struct resource_entry *entry; struct resource_entry *entry;
struct i2c_board_info info; struct i2c_board_info info;
struct acpi_device *adev; struct acpi_device *adev;
@ -170,7 +170,7 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level,
*/ */
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_find_address, &lookup); i2c_acpi_find_address, &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)
@ -202,17 +202,17 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level,
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;
@ -220,15 +220,15 @@ 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");
} }
#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) { }
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
#ifdef CONFIG_ACPI_I2C_OPREGION #ifdef CONFIG_ACPI_I2C_OPREGION
@ -293,12 +293,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;
@ -417,10 +417,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)
@ -431,7 +431,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;
@ -445,7 +445,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)) {
@ -459,10 +459,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)
@ -475,7 +475,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))
@ -484,10 +484,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 */
@ -1657,8 +1657,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);
@ -1830,7 +1830,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,