lkml.org 
[lkml]   [2022]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH v3 1/2] hwmon: acpi_power_meter: fix style issue
    On Mon, May 09, 2022 at 06:30:09AM +0000, Corentin Labbe wrote:
    > Fix style issues found by checkpatch.
    >
    > Signed-off-by: Corentin Labbe <clabbe@baylibre.com>

    Applied to hwmon-next.

    Thanks,
    Guenter

    > ---
    > drivers/hwmon/acpi_power_meter.c | 17 +++++++++--------
    > 1 file changed, 9 insertions(+), 8 deletions(-)
    >
    > diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
    > index c405a5869581..d2545a1be9fc 100644
    > --- a/drivers/hwmon/acpi_power_meter.c
    > +++ b/drivers/hwmon/acpi_power_meter.c
    > @@ -481,7 +481,7 @@ static struct sensor_template meter_attrs[] = {
    > RO_SENSOR_TEMPLATE("power1_average_interval_max", show_val, 1),
    > RO_SENSOR_TEMPLATE("power1_is_battery", show_val, 5),
    > RW_SENSOR_TEMPLATE(POWER_AVG_INTERVAL_NAME, show_avg_interval,
    > - set_avg_interval, 0),
    > + set_avg_interval, 0),
    > {},
    > };
    >
    > @@ -530,6 +530,7 @@ static void remove_domain_devices(struct acpi_power_meter_resource *resource)
    >
    > for (i = 0; i < resource->num_domain_devices; i++) {
    > struct acpi_device *obj = resource->domain_devices[i];
    > +
    > if (!obj)
    > continue;
    >
    > @@ -580,7 +581,7 @@ static int read_domain_devices(struct acpi_power_meter_resource *resource)
    > }
    >
    > resource->holders_dir = kobject_create_and_add("measures",
    > - &resource->acpi_dev->dev.kobj);
    > + &resource->acpi_dev->dev.kobj);
    > if (!resource->holders_dir) {
    > res = -ENOMEM;
    > goto exit_free;
    > @@ -590,7 +591,7 @@ static int read_domain_devices(struct acpi_power_meter_resource *resource)
    >
    > for (i = 0; i < pss->package.count; i++) {
    > struct acpi_device *obj;
    > - union acpi_object *element = &(pss->package.elements[i]);
    > + union acpi_object *element = &pss->package.elements[i];
    >
    > /* Refuse non-references */
    > if (element->type != ACPI_TYPE_LOCAL_REFERENCE)
    > @@ -603,7 +604,7 @@ static int read_domain_devices(struct acpi_power_meter_resource *resource)
    > continue;
    >
    > res = sysfs_create_link(resource->holders_dir, &obj->dev.kobj,
    > - kobject_name(&obj->dev.kobj));
    > + kobject_name(&obj->dev.kobj));
    > if (res) {
    > acpi_dev_put(obj);
    > resource->domain_devices[i] = NULL;
    > @@ -788,7 +789,7 @@ static int read_capabilities(struct acpi_power_meter_resource *resource)
    > str = &resource->model_number;
    >
    > for (i = 11; i < 14; i++) {
    > - union acpi_object *element = &(pss->package.elements[i]);
    > + union acpi_object *element = &pss->package.elements[i];
    >
    > if (element->type != ACPI_TYPE_STRING) {
    > res = -EINVAL;
    > @@ -868,8 +869,7 @@ static int acpi_power_meter_add(struct acpi_device *device)
    > if (!device)
    > return -EINVAL;
    >
    > - resource = kzalloc(sizeof(struct acpi_power_meter_resource),
    > - GFP_KERNEL);
    > + resource = kzalloc(sizeof(*resource), GFP_KERNEL);
    > if (!resource)
    > return -ENOMEM;
    >
    > @@ -884,7 +884,8 @@ static int acpi_power_meter_add(struct acpi_device *device)
    > if (res)
    > goto exit_free;
    >
    > - resource->trip[0] = resource->trip[1] = -1;
    > + resource->trip[0] = -1;
    > + resource->trip[1] = -1;
    >
    > res = setup_attrs(resource);
    > if (res)

    \
     
     \ /
      Last update: 2022-05-10 04:39    [W:8.651 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site