| Message ID | 20170131155317.20106-1-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Commit | 7fa2c7038cc0ec16ae5d8eee347ea136de0f4b65 |
| Headers | show |
Am 31.01.2017 um 16:53 schrieb Colin King: > From: Colin Ian King <colin.king@canonical.com> > > Checking for ret < 0 is redundant because a previous check on ret > being non-zero already handles the ret < 0 case. Remove the redundant > code. Found by CoverityScan, CID#1398863, CID#1398864 > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Richard Weinberger <richard@nod.at> Thanks, //richard
On 01/31/2017 04:53 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Checking for ret < 0 is redundant because a previous check on ret > being non-zero already handles the ret < 0 case. Remove the redundant > code. Found by CoverityScan, CID#1398863, CID#1398864 > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Marek Vasut <marek.vasut@gmail.com> Thanks > --- > drivers/mtd/spi-nor/cadence-quadspi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c > index 3fb7be8..9f8102d 100644 > --- a/drivers/mtd/spi-nor/cadence-quadspi.c > +++ b/drivers/mtd/spi-nor/cadence-quadspi.c > @@ -893,7 +893,7 @@ static ssize_t cqspi_write(struct spi_nor *nor, loff_t to, > if (ret) > return ret; > > - return (ret < 0) ? ret : len; > + return len; > } > > static ssize_t cqspi_read(struct spi_nor *nor, loff_t from, > @@ -913,7 +913,7 @@ static ssize_t cqspi_read(struct spi_nor *nor, loff_t from, > if (ret) > return ret; > > - return (ret < 0) ? ret : len; > + return len; > } > > static int cqspi_erase(struct spi_nor *nor, loff_t offs) >
Le 31/01/2017 à 16:53, Colin King a écrit : > From: Colin Ian King <colin.king@canonical.com> > > Checking for ret < 0 is redundant because a previous check on ret > being non-zero already handles the ret < 0 case. Remove the redundant > code. Found by CoverityScan, CID#1398863, CID#1398864 > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Applied to the github spi-nor tree. Thanks! > --- > drivers/mtd/spi-nor/cadence-quadspi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c > index 3fb7be8..9f8102d 100644 > --- a/drivers/mtd/spi-nor/cadence-quadspi.c > +++ b/drivers/mtd/spi-nor/cadence-quadspi.c > @@ -893,7 +893,7 @@ static ssize_t cqspi_write(struct spi_nor *nor, loff_t to, > if (ret) > return ret; > > - return (ret < 0) ? ret : len; > + return len; > } > > static ssize_t cqspi_read(struct spi_nor *nor, loff_t from, > @@ -913,7 +913,7 @@ static ssize_t cqspi_read(struct spi_nor *nor, loff_t from, > if (ret) > return ret; > > - return (ret < 0) ? ret : len; > + return len; > } > > static int cqspi_erase(struct spi_nor *nor, loff_t offs) >
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c index 3fb7be8..9f8102d 100644 --- a/drivers/mtd/spi-nor/cadence-quadspi.c +++ b/drivers/mtd/spi-nor/cadence-quadspi.c @@ -893,7 +893,7 @@ static ssize_t cqspi_write(struct spi_nor *nor, loff_t to, if (ret) return ret; - return (ret < 0) ? ret : len; + return len; } static ssize_t cqspi_read(struct spi_nor *nor, loff_t from, @@ -913,7 +913,7 @@ static ssize_t cqspi_read(struct spi_nor *nor, loff_t from, if (ret) return ret; - return (ret < 0) ? ret : len; + return len; } static int cqspi_erase(struct spi_nor *nor, loff_t offs)