| Message ID | 20180301090413.31e56aa6@endymion |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: scmi: Use standard device message logging functions | expand |
On 3/1/2018 9:04 AM, Jean Delvare wrote: > ACPI_ERROR and ACPI_DEBUG_PRINT are not intended to be used by device > drivers. Use acpi_handle message logging functions instead. > > As a nice side effect, it removes the following compiler warnings > which were printed when ACPI debug is disabled: > > drivers/i2c/busses/i2c-scmi.c: In function "acpi_smbus_cmi_add_cap": > drivers/i2c/busses/i2c-scmi.c:328:39: warning: suggest braces around empty body in an "else" statement [-Wempty-body] > drivers/i2c/busses/i2c-scmi.c:338:12: warning: suggest braces around empty body in an "else" statement [-Wempty-body] > > Suggested-by: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> > Signed-off-by: Jean Delvare <jdelvare@suse.de> > Cc: Wolfram Sang <wsa@the-dreams.de> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > Changes since v1: > * Use acpi_handle_* instead of dev_* (suggested by Rafael J. Wysocki) > > drivers/i2c/busses/i2c-scmi.c | 35 +++++++++++++++++++---------------- > 1 file changed, 19 insertions(+), 16 deletions(-) > > --- linux-4.16-rc3.orig/drivers/i2c/busses/i2c-scmi.c 2018-02-28 20:32:50.941786678 +0100 > +++ linux-4.16-rc3/drivers/i2c/busses/i2c-scmi.c 2018-02-28 20:32:52.109799072 +0100 > @@ -182,7 +182,8 @@ acpi_smbus_cmi_access(struct i2c_adapter > status = acpi_evaluate_object(smbus_cmi->handle, method, &input, > &buffer); > if (ACPI_FAILURE(status)) { > - ACPI_ERROR((AE_INFO, "Evaluating %s: %i", method, status)); > + acpi_handle_err(smbus_cmi->handle, > + "Failed to evaluate %s: %i\n", method, status); > return -EIO; > } > > @@ -190,19 +191,19 @@ acpi_smbus_cmi_access(struct i2c_adapter > if (pkg && pkg->type == ACPI_TYPE_PACKAGE) > obj = pkg->package.elements; > else { > - ACPI_ERROR((AE_INFO, "Invalid argument type")); > + acpi_handle_err(smbus_cmi->handle, "Invalid argument type\n"); > result = -EIO; > goto out; > } > if (obj == NULL || obj->type != ACPI_TYPE_INTEGER) { > - ACPI_ERROR((AE_INFO, "Invalid argument type")); > + acpi_handle_err(smbus_cmi->handle, "Invalid argument type\n"); > result = -EIO; > goto out; > } > > result = obj->integer.value; > - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s return status: %i\n", > - method, result)); > + acpi_handle_debug(smbus_cmi->handle, "%s return status: %i\n", method, > + result); > > switch (result) { > case ACPI_SMBUS_STATUS_OK: > @@ -227,7 +228,7 @@ acpi_smbus_cmi_access(struct i2c_adapter > > obj = pkg->package.elements + 1; > if (obj->type != ACPI_TYPE_INTEGER) { > - ACPI_ERROR((AE_INFO, "Invalid argument type")); > + acpi_handle_err(smbus_cmi->handle, "Invalid argument type\n"); > result = -EIO; > goto out; > } > @@ -239,7 +240,8 @@ acpi_smbus_cmi_access(struct i2c_adapter > case I2C_SMBUS_BYTE_DATA: > case I2C_SMBUS_WORD_DATA: > if (obj->type != ACPI_TYPE_INTEGER) { > - ACPI_ERROR((AE_INFO, "Invalid argument type")); > + acpi_handle_err(smbus_cmi->handle, > + "Invalid argument type\n"); > result = -EIO; > goto out; > } > @@ -250,7 +252,8 @@ acpi_smbus_cmi_access(struct i2c_adapter > break; > case I2C_SMBUS_BLOCK_DATA: > if (obj->type != ACPI_TYPE_BUFFER) { > - ACPI_ERROR((AE_INFO, "Invalid argument type")); > + acpi_handle_err(smbus_cmi->handle, > + "Invalid argument type\n"); > result = -EIO; > goto out; > } > @@ -300,6 +303,7 @@ static int acpi_smbus_cmi_add_cap(struct > const char *name) > { > struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; > + struct acpi_handle *handle = smbus_cmi->handle; > union acpi_object *obj; > acpi_status status; > > @@ -308,8 +312,8 @@ static int acpi_smbus_cmi_add_cap(struct > smbus_cmi->methods->mt_info, > NULL, &buffer); > if (ACPI_FAILURE(status)) { > - ACPI_ERROR((AE_INFO, "Evaluating %s: %i", > - smbus_cmi->methods->mt_info, status)); > + acpi_handle_err(handle, "Failed to evaluate %s: %i\n", > + smbus_cmi->methods->mt_info, status); > return -EIO; > } > > @@ -317,18 +321,18 @@ static int acpi_smbus_cmi_add_cap(struct > if (obj && obj->type == ACPI_TYPE_PACKAGE) > obj = obj->package.elements; > else { > - ACPI_ERROR((AE_INFO, "Invalid argument type")); > + acpi_handle_err(handle, "Invalid argument type\n"); > kfree(buffer.pointer); > return -EIO; > } > > if (obj->type != ACPI_TYPE_INTEGER) { > - ACPI_ERROR((AE_INFO, "Invalid argument type")); > + acpi_handle_err(handle, "Invalid argument type\n"); > kfree(buffer.pointer); > return -EIO; > } else > - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "SMBus CMI Version %x" > - "\n", (int)obj->integer.value)); > + acpi_handle_debug(handle, "SMBus CMI Version %x\n", > + (int)obj->integer.value); > > kfree(buffer.pointer); > smbus_cmi->cap_info = 1; > @@ -337,8 +341,7 @@ static int acpi_smbus_cmi_add_cap(struct > else if (!strcmp(name, smbus_cmi->methods->mt_sbw)) > smbus_cmi->cap_write = 1; > else > - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Unsupported CMI method: %s\n", > - name)); > + acpi_handle_debug(handle, "Unsupported CMI method: %s\n", name); > > return 0; > } > >
On Thu, Mar 01, 2018 at 09:04:13AM +0100, Jean Delvare wrote: > ACPI_ERROR and ACPI_DEBUG_PRINT are not intended to be used by device > drivers. Use acpi_handle message logging functions instead. > > As a nice side effect, it removes the following compiler warnings > which were printed when ACPI debug is disabled: > > drivers/i2c/busses/i2c-scmi.c: In function "acpi_smbus_cmi_add_cap": > drivers/i2c/busses/i2c-scmi.c:328:39: warning: suggest braces around empty body in an "else" statement [-Wempty-body] > drivers/i2c/busses/i2c-scmi.c:338:12: warning: suggest braces around empty body in an "else" statement [-Wempty-body] > > Suggested-by: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> > Signed-off-by: Jean Delvare <jdelvare@suse.de> > Cc: Wolfram Sang <wsa@the-dreams.de> Applied to for-next, thanks!
--- linux-4.16-rc3.orig/drivers/i2c/busses/i2c-scmi.c 2018-02-28 20:32:50.941786678 +0100 +++ linux-4.16-rc3/drivers/i2c/busses/i2c-scmi.c 2018-02-28 20:32:52.109799072 +0100 @@ -182,7 +182,8 @@ acpi_smbus_cmi_access(struct i2c_adapter status = acpi_evaluate_object(smbus_cmi->handle, method, &input, &buffer); if (ACPI_FAILURE(status)) { - ACPI_ERROR((AE_INFO, "Evaluating %s: %i", method, status)); + acpi_handle_err(smbus_cmi->handle, + "Failed to evaluate %s: %i\n", method, status); return -EIO; } @@ -190,19 +191,19 @@ acpi_smbus_cmi_access(struct i2c_adapter if (pkg && pkg->type == ACPI_TYPE_PACKAGE) obj = pkg->package.elements; else { - ACPI_ERROR((AE_INFO, "Invalid argument type")); + acpi_handle_err(smbus_cmi->handle, "Invalid argument type\n"); result = -EIO; goto out; } if (obj == NULL || obj->type != ACPI_TYPE_INTEGER) { - ACPI_ERROR((AE_INFO, "Invalid argument type")); + acpi_handle_err(smbus_cmi->handle, "Invalid argument type\n"); result = -EIO; goto out; } result = obj->integer.value; - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s return status: %i\n", - method, result)); + acpi_handle_debug(smbus_cmi->handle, "%s return status: %i\n", method, + result); switch (result) { case ACPI_SMBUS_STATUS_OK: @@ -227,7 +228,7 @@ acpi_smbus_cmi_access(struct i2c_adapter obj = pkg->package.elements + 1; if (obj->type != ACPI_TYPE_INTEGER) { - ACPI_ERROR((AE_INFO, "Invalid argument type")); + acpi_handle_err(smbus_cmi->handle, "Invalid argument type\n"); result = -EIO; goto out; } @@ -239,7 +240,8 @@ acpi_smbus_cmi_access(struct i2c_adapter case I2C_SMBUS_BYTE_DATA: case I2C_SMBUS_WORD_DATA: if (obj->type != ACPI_TYPE_INTEGER) { - ACPI_ERROR((AE_INFO, "Invalid argument type")); + acpi_handle_err(smbus_cmi->handle, + "Invalid argument type\n"); result = -EIO; goto out; } @@ -250,7 +252,8 @@ acpi_smbus_cmi_access(struct i2c_adapter break; case I2C_SMBUS_BLOCK_DATA: if (obj->type != ACPI_TYPE_BUFFER) { - ACPI_ERROR((AE_INFO, "Invalid argument type")); + acpi_handle_err(smbus_cmi->handle, + "Invalid argument type\n"); result = -EIO; goto out; } @@ -300,6 +303,7 @@ static int acpi_smbus_cmi_add_cap(struct const char *name) { struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; + struct acpi_handle *handle = smbus_cmi->handle; union acpi_object *obj; acpi_status status; @@ -308,8 +312,8 @@ static int acpi_smbus_cmi_add_cap(struct smbus_cmi->methods->mt_info, NULL, &buffer); if (ACPI_FAILURE(status)) { - ACPI_ERROR((AE_INFO, "Evaluating %s: %i", - smbus_cmi->methods->mt_info, status)); + acpi_handle_err(handle, "Failed to evaluate %s: %i\n", + smbus_cmi->methods->mt_info, status); return -EIO; } @@ -317,18 +321,18 @@ static int acpi_smbus_cmi_add_cap(struct if (obj && obj->type == ACPI_TYPE_PACKAGE) obj = obj->package.elements; else { - ACPI_ERROR((AE_INFO, "Invalid argument type")); + acpi_handle_err(handle, "Invalid argument type\n"); kfree(buffer.pointer); return -EIO; } if (obj->type != ACPI_TYPE_INTEGER) { - ACPI_ERROR((AE_INFO, "Invalid argument type")); + acpi_handle_err(handle, "Invalid argument type\n"); kfree(buffer.pointer); return -EIO; } else - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "SMBus CMI Version %x" - "\n", (int)obj->integer.value)); + acpi_handle_debug(handle, "SMBus CMI Version %x\n", + (int)obj->integer.value); kfree(buffer.pointer); smbus_cmi->cap_info = 1; @@ -337,8 +341,7 @@ static int acpi_smbus_cmi_add_cap(struct else if (!strcmp(name, smbus_cmi->methods->mt_sbw)) smbus_cmi->cap_write = 1; else - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Unsupported CMI method: %s\n", - name)); + acpi_handle_debug(handle, "Unsupported CMI method: %s\n", name); return 0; }
ACPI_ERROR and ACPI_DEBUG_PRINT are not intended to be used by device drivers. Use acpi_handle message logging functions instead. As a nice side effect, it removes the following compiler warnings which were printed when ACPI debug is disabled: drivers/i2c/busses/i2c-scmi.c: In function "acpi_smbus_cmi_add_cap": drivers/i2c/busses/i2c-scmi.c:328:39: warning: suggest braces around empty body in an "else" statement [-Wempty-body] drivers/i2c/busses/i2c-scmi.c:338:12: warning: suggest braces around empty body in an "else" statement [-Wempty-body] Suggested-by: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Wolfram Sang <wsa@the-dreams.de> --- Changes since v1: * Use acpi_handle_* instead of dev_* (suggested by Rafael J. Wysocki) drivers/i2c/busses/i2c-scmi.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-)