lkml.org 
[lkml]   [2020]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 093/117] i2c: altera: use proper variable to hold errno
    Date
    From: Wolfram Sang <wsa+renesas@sang-engineering.com>

    commit edb2c9dd3948738ef030c32b948543e84f4d3f81 upstream.

    device_property_read_u32() returns errno or 0, so we should use the
    integer variable 'ret' and not the u32 'val' to hold the retval.

    Fixes: 0560ad576268 ("i2c: altera: Add Altera I2C Controller driver")
    Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    Reviewed-by: Thor Thayer <thor.thayer@linux.intel.com>
    Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/i2c/busses/i2c-altera.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    --- a/drivers/i2c/busses/i2c-altera.c
    +++ b/drivers/i2c/busses/i2c-altera.c
    @@ -395,7 +395,6 @@ static int altr_i2c_probe(struct platfor
    struct altr_i2c_dev *idev = NULL;
    struct resource *res;
    int irq, ret;
    - u32 val;

    idev = devm_kzalloc(&pdev->dev, sizeof(*idev), GFP_KERNEL);
    if (!idev)
    @@ -422,17 +421,17 @@ static int altr_i2c_probe(struct platfor
    init_completion(&idev->msg_complete);
    spin_lock_init(&idev->lock);

    - val = device_property_read_u32(idev->dev, "fifo-size",
    + ret = device_property_read_u32(idev->dev, "fifo-size",
    &idev->fifo_size);
    - if (val) {
    + if (ret) {
    dev_err(&pdev->dev, "FIFO size set to default of %d\n",
    ALTR_I2C_DFLT_FIFO_SZ);
    idev->fifo_size = ALTR_I2C_DFLT_FIFO_SZ;
    }

    - val = device_property_read_u32(idev->dev, "clock-frequency",
    + ret = device_property_read_u32(idev->dev, "clock-frequency",
    &idev->bus_clk_rate);
    - if (val) {
    + if (ret) {
    dev_err(&pdev->dev, "Default to 100kHz\n");
    idev->bus_clk_rate = 100000; /* default clock rate */
    }

    \
     
     \ /
      Last update: 2020-05-01 15:35    [W:2.210 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site