lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0242/1095] iio: core: fix a few code style issues
    Date
    From: Alexander Vorwerk <alexander.vorwerk@stud.uni-goettingen.de>

    [ Upstream commit f4decb4c6e374a4ded59a6a76b8236695e44d8bc ]

    * Fix indent in else statement
    * Remove unnecessary 'else' after 'break'
    * Remove space in '* attr'

    Signed-off-by: Alexander Vorwerk <alexander.vorwerk@stud.uni-goettingen.de>
    Link: https://lore.kernel.org/r/20220312180343.8935-1-alexander.vorwerk@stud.uni-goettingen.de
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iio/industrialio-buffer.c | 4 ++--
    drivers/iio/industrialio-core.c | 3 +--
    2 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
    index b078eb2f3c9d..01369973329a 100644
    --- a/drivers/iio/industrialio-buffer.c
    +++ b/drivers/iio/industrialio-buffer.c
    @@ -915,7 +915,7 @@ static int iio_verify_update(struct iio_dev *indio_dev,
    if (scan_mask == NULL)
    return -EINVAL;
    } else {
    - scan_mask = compound_mask;
    + scan_mask = compound_mask;
    }

    config->scan_bytes = iio_compute_scan_bytes(indio_dev,
    @@ -1649,7 +1649,7 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer,
    }

    attrn = buffer_attrcount + scan_el_attrcount + ARRAY_SIZE(iio_buffer_attrs);
    - attr = kcalloc(attrn + 1, sizeof(* attr), GFP_KERNEL);
    + attr = kcalloc(attrn + 1, sizeof(*attr), GFP_KERNEL);
    if (!attr) {
    ret = -ENOMEM;
    goto error_free_scan_mask;
    diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
    index 58d1180f4f61..b2d2b42614d3 100644
    --- a/drivers/iio/industrialio-core.c
    +++ b/drivers/iio/industrialio-core.c
    @@ -908,8 +908,7 @@ static int __iio_str_to_fixpoint(const char *str, int fract_mult,
    } else if (*str == '\n') {
    if (*(str + 1) == '\0')
    break;
    - else
    - return -EINVAL;
    + return -EINVAL;
    } else if (!strncmp(str, " dB", sizeof(" dB") - 1) && scale_db) {
    /* Ignore the dB suffix */
    str += sizeof(" dB") - 1;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 22:41    [W:4.019 / U:0.820 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site