Heiner Kallweit <hkallweit1@xxxxxxxxx> writes:
> Remove unneeded variable ret and simplify the if block.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx>
> ---
> v2:
> - no changes
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxx>
> ---
> drivers/mmc/host/meson-gx-mmc.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index 529a4f22..4ce4c640 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -670,7 +670,6 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)
> struct mmc_command *cmd = host->cmd;
> struct mmc_data *data;
> unsigned int xfer_bytes;
> - int ret = IRQ_HANDLED;
>
> if (WARN_ON(!mrq))
> return IRQ_NONE;
> @@ -679,14 +678,12 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)
> return IRQ_NONE;
>
> data = cmd->data;
> - if (data) {
> + if (data && data->flags & MMC_DATA_READ) {
> xfer_bytes = data->blksz * data->blocks;
> - if (data->flags & MMC_DATA_READ) {
> - WARN_ON(xfer_bytes > host->bounce_buf_size);
> - sg_copy_from_buffer(data->sg, data->sg_len,
> - host->bounce_buf, xfer_bytes);
> - data->bytes_xfered = xfer_bytes;
> - }
> + WARN_ON(xfer_bytes > host->bounce_buf_size);
> + sg_copy_from_buffer(data->sg, data->sg_len,
> + host->bounce_buf, xfer_bytes);
> + data->bytes_xfered = xfer_bytes;
> }
>
> meson_mmc_read_resp(host->mmc, cmd);
> @@ -695,7 +692,7 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)
> else
> meson_mmc_start_cmd(host->mmc, data->stop);
>
> - return ret;
> + return IRQ_HANDLED;
> }
>
> /*
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
