From: Dan Carpenter <dan.carpenter@oracle.com>
To: "Liam Girdwood" <lgirdwood@gmail.com>,
"Mylène Josserand" <mylene.josserand@free-electrons.com>
Cc: alsa-devel@alsa-project.org,
Wei Yongjun <yongjun_wei@trendmicro.com.cn>,
kernel-janitors@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
Chen-Yu Tsai <wens@csie.org>, Mark Brown <broonie@kernel.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [patch] ASoC: sun4i-i2s: remove some dead code
Date: Tue, 7 Feb 2017 16:19:34 +0300 [thread overview]
Message-ID: <20170207131934.GD28207@mwanda> (raw)
"i2s->rst" is either NULL or a valid pointer. We won't probe
successfully if it's an error pointer. That means these checks can be
removed.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 3635bbc72cbc..d79be3e4361b 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -723,13 +723,11 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
}
}
- if (!IS_ERR(i2s->rst)) {
- ret = reset_control_deassert(i2s->rst);
- if (ret) {
- dev_err(&pdev->dev,
- "Failed to deassert the reset control\n");
- return -EINVAL;
- }
+ ret = reset_control_deassert(i2s->rst);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Failed to deassert the reset control\n");
+ return -EINVAL;
}
i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG;
@@ -766,8 +764,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
sun4i_i2s_runtime_suspend(&pdev->dev);
err_pm_disable:
pm_runtime_disable(&pdev->dev);
- if (!IS_ERR(i2s->rst))
- reset_control_assert(i2s->rst);
+ reset_control_assert(i2s->rst);
return ret;
}
@@ -782,8 +779,7 @@ static int sun4i_i2s_remove(struct platform_device *pdev)
if (!pm_runtime_status_suspended(&pdev->dev))
sun4i_i2s_runtime_suspend(&pdev->dev);
- if (!IS_ERR(i2s->rst))
- reset_control_assert(i2s->rst);
+ reset_control_assert(i2s->rst);
return 0;
}
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: "Liam Girdwood" <lgirdwood@gmail.com>,
"Mylène Josserand" <mylene.josserand@free-electrons.com>
Cc: alsa-devel@alsa-project.org,
Wei Yongjun <yongjun_wei@trendmicro.com.cn>,
kernel-janitors@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
Chen-Yu Tsai <wens@csie.org>, Mark Brown <broonie@kernel.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [patch] ASoC: sun4i-i2s: remove some dead code
Date: Tue, 07 Feb 2017 13:19:34 +0000 [thread overview]
Message-ID: <20170207131934.GD28207@mwanda> (raw)
"i2s->rst" is either NULL or a valid pointer. We won't probe
successfully if it's an error pointer. That means these checks can be
removed.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 3635bbc72cbc..d79be3e4361b 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -723,13 +723,11 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
}
}
- if (!IS_ERR(i2s->rst)) {
- ret = reset_control_deassert(i2s->rst);
- if (ret) {
- dev_err(&pdev->dev,
- "Failed to deassert the reset control\n");
- return -EINVAL;
- }
+ ret = reset_control_deassert(i2s->rst);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Failed to deassert the reset control\n");
+ return -EINVAL;
}
i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG;
@@ -766,8 +764,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
sun4i_i2s_runtime_suspend(&pdev->dev);
err_pm_disable:
pm_runtime_disable(&pdev->dev);
- if (!IS_ERR(i2s->rst))
- reset_control_assert(i2s->rst);
+ reset_control_assert(i2s->rst);
return ret;
}
@@ -782,8 +779,7 @@ static int sun4i_i2s_remove(struct platform_device *pdev)
if (!pm_runtime_status_suspended(&pdev->dev))
sun4i_i2s_runtime_suspend(&pdev->dev);
- if (!IS_ERR(i2s->rst))
- reset_control_assert(i2s->rst);
+ reset_control_assert(i2s->rst);
return 0;
}
next reply other threads:[~2017-02-07 13:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 13:19 Dan Carpenter [this message]
2017-02-07 13:19 ` [patch] ASoC: sun4i-i2s: remove some dead code Dan Carpenter
2017-02-07 13:42 ` Maxime Ripard
2017-02-07 13:42 ` Maxime Ripard
2017-02-07 13:50 ` Dan Carpenter
2017-02-07 13:50 ` Dan Carpenter
2017-02-08 8:58 ` Maxime Ripard
2017-02-08 8:58 ` Maxime Ripard
2017-02-08 9:01 ` Chen-Yu Tsai
2017-02-08 9:01 ` Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170207131934.GD28207@mwanda \
--to=dan.carpenter@oracle.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=maxime.ripard@free-electrons.com \
--cc=mylene.josserand@free-electrons.com \
--cc=tiwai@suse.com \
--cc=wens@csie.org \
--cc=yongjun_wei@trendmicro.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.