* [PATCH] media: imx: imx8mq-mipi_csi2: Remove unneeded code
@ 2022-01-28 13:36 Muhammad Usama Anjum
2022-01-28 13:52 ` Marc Kleine-Budde
2022-01-28 16:23 ` Fabio Estevam
0 siblings, 2 replies; 5+ messages in thread
From: Muhammad Usama Anjum @ 2022-01-28 13:36 UTC (permalink / raw)
To: Steve Longerbeam, Philipp Zabel, Mauro Carvalho Chehab,
Greg Kroah-Hartman, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Martin Kepplinger, Hans Verkuil
Cc: Muhammad Usama Anjum, kernel, kernel-janitors, linux-media,
linux-staging, linux-arm-kernel, linux-kernel
ret is constant in imx8mq_mipi_csi_pm_suspend(). This function cannot
return error. Remove the return variable. Simplify other functions which
are using this function.
Fixes: f0c2ba1ed4ad ("media: imx: imx8mq-mipi_csi2: fix system resume")
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
---
drivers/staging/media/imx/imx8mq-mipi-csi2.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/media/imx/imx8mq-mipi-csi2.c b/drivers/staging/media/imx/imx8mq-mipi-csi2.c
index 3b9fa75efac6b..c992b845e63d1 100644
--- a/drivers/staging/media/imx/imx8mq-mipi-csi2.c
+++ b/drivers/staging/media/imx/imx8mq-mipi-csi2.c
@@ -693,11 +693,10 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state)
* Suspend/resume
*/
-static int imx8mq_mipi_csi_pm_suspend(struct device *dev)
+static void imx8mq_mipi_csi_pm_suspend(struct device *dev)
{
struct v4l2_subdev *sd = dev_get_drvdata(dev);
struct csi_state *state = mipi_sd_to_csi2_state(sd);
- int ret = 0;
mutex_lock(&state->lock);
@@ -708,8 +707,6 @@ static int imx8mq_mipi_csi_pm_suspend(struct device *dev)
}
mutex_unlock(&state->lock);
-
- return ret ? -EAGAIN : 0;
}
static int imx8mq_mipi_csi_pm_resume(struct device *dev)
@@ -742,15 +739,12 @@ static int __maybe_unused imx8mq_mipi_csi_suspend(struct device *dev)
{
struct v4l2_subdev *sd = dev_get_drvdata(dev);
struct csi_state *state = mipi_sd_to_csi2_state(sd);
- int ret;
- ret = imx8mq_mipi_csi_pm_suspend(dev);
- if (ret)
- return ret;
+ imx8mq_mipi_csi_pm_suspend(dev);
state->state |= ST_SUSPENDED;
- return ret;
+ return 0;
}
static int __maybe_unused imx8mq_mipi_csi_resume(struct device *dev)
@@ -770,9 +764,7 @@ static int __maybe_unused imx8mq_mipi_csi_runtime_suspend(struct device *dev)
struct csi_state *state = mipi_sd_to_csi2_state(sd);
int ret;
- ret = imx8mq_mipi_csi_pm_suspend(dev);
- if (ret)
- return ret;
+ imx8mq_mipi_csi_pm_suspend(dev);
ret = icc_set_bw(state->icc_path, 0, 0);
if (ret)
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] media: imx: imx8mq-mipi_csi2: Remove unneeded code
2022-01-28 13:36 [PATCH] media: imx: imx8mq-mipi_csi2: Remove unneeded code Muhammad Usama Anjum
@ 2022-01-28 13:52 ` Marc Kleine-Budde
2022-01-28 14:51 ` Muhammad Usama Anjum
2022-01-28 16:23 ` Fabio Estevam
1 sibling, 1 reply; 5+ messages in thread
From: Marc Kleine-Budde @ 2022-01-28 13:52 UTC (permalink / raw)
To: Muhammad Usama Anjum
Cc: Steve Longerbeam, Philipp Zabel, Mauro Carvalho Chehab,
Greg Kroah-Hartman, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Martin Kepplinger, Hans Verkuil, linux-staging, kernel-janitors,
linux-kernel, kernel, linux-arm-kernel, linux-media
[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]
On 28.01.2022 18:36:49, Muhammad Usama Anjum wrote:
> ret is constant in imx8mq_mipi_csi_pm_suspend(). This function cannot
> return error. Remove the return variable. Simplify other functions which
> are using this function.
>
> Fixes: f0c2ba1ed4ad ("media: imx: imx8mq-mipi_csi2: fix system resume")
> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
> ---
> drivers/staging/media/imx/imx8mq-mipi-csi2.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/media/imx/imx8mq-mipi-csi2.c b/drivers/staging/media/imx/imx8mq-mipi-csi2.c
> index 3b9fa75efac6b..c992b845e63d1 100644
> --- a/drivers/staging/media/imx/imx8mq-mipi-csi2.c
> +++ b/drivers/staging/media/imx/imx8mq-mipi-csi2.c
[...]
> static int imx8mq_mipi_csi_pm_resume(struct device *dev)
> @@ -742,15 +739,12 @@ static int __maybe_unused imx8mq_mipi_csi_suspend(struct device *dev)
> {
> struct v4l2_subdev *sd = dev_get_drvdata(dev);
> struct csi_state *state = mipi_sd_to_csi2_state(sd);
> - int ret;
>
> - ret = imx8mq_mipi_csi_pm_suspend(dev);
> - if (ret)
> - return ret;
> + imx8mq_mipi_csi_pm_suspend(dev);
>
> state->state |= ST_SUSPENDED;
what about this flag?
Marc
>
> - return ret;
> + return 0;
> }
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] media: imx: imx8mq-mipi_csi2: Remove unneeded code
2022-01-28 13:52 ` Marc Kleine-Budde
@ 2022-01-28 14:51 ` Muhammad Usama Anjum
0 siblings, 0 replies; 5+ messages in thread
From: Muhammad Usama Anjum @ 2022-01-28 14:51 UTC (permalink / raw)
To: Marc Kleine-Budde
Cc: usama.anjum, Steve Longerbeam, Philipp Zabel,
Mauro Carvalho Chehab, Greg Kroah-Hartman, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
NXP Linux Team, Martin Kepplinger, Hans Verkuil, linux-staging,
kernel-janitors, linux-kernel, kernel, linux-arm-kernel,
linux-media
On 1/28/22 6:52 PM, Marc Kleine-Budde wrote:
> On 28.01.2022 18:36:49, Muhammad Usama Anjum wrote:
>> ret is constant in imx8mq_mipi_csi_pm_suspend(). This function cannot
>> return error. Remove the return variable. Simplify other functions which
>> are using this function.
>>
>> Fixes: f0c2ba1ed4ad ("media: imx: imx8mq-mipi_csi2: fix system resume")
>> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
>> ---
>> drivers/staging/media/imx/imx8mq-mipi-csi2.c | 16 ++++------------
>> 1 file changed, 4 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/staging/media/imx/imx8mq-mipi-csi2.c b/drivers/staging/media/imx/imx8mq-mipi-csi2.c
>> index 3b9fa75efac6b..c992b845e63d1 100644
>> --- a/drivers/staging/media/imx/imx8mq-mipi-csi2.c
>> +++ b/drivers/staging/media/imx/imx8mq-mipi-csi2.c
> [...]
>> static int imx8mq_mipi_csi_pm_resume(struct device *dev)
>> @@ -742,15 +739,12 @@ static int __maybe_unused imx8mq_mipi_csi_suspend(struct device *dev)
>> {
>> struct v4l2_subdev *sd = dev_get_drvdata(dev);
>> struct csi_state *state = mipi_sd_to_csi2_state(sd);
>> - int ret;
>>
>> - ret = imx8mq_mipi_csi_pm_suspend(dev);
>> - if (ret)
>> - return ret;
>> + imx8mq_mipi_csi_pm_suspend(dev);
>>
>> state->state |= ST_SUSPENDED;
>
>
> what about this flag?
Now that no error is possible inside this function. The state is being
updated each time. This seems correct logically.
Thanks,
Usama
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] media: imx: imx8mq-mipi_csi2: Remove unneeded code
2022-01-28 13:36 [PATCH] media: imx: imx8mq-mipi_csi2: Remove unneeded code Muhammad Usama Anjum
2022-01-28 13:52 ` Marc Kleine-Budde
@ 2022-01-28 16:23 ` Fabio Estevam
2022-01-28 17:01 ` Muhammad Usama Anjum
1 sibling, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2022-01-28 16:23 UTC (permalink / raw)
To: Muhammad Usama Anjum
Cc: Steve Longerbeam, Philipp Zabel, Mauro Carvalho Chehab,
Greg Kroah-Hartman, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, NXP Linux Team, Martin Kepplinger,
Hans Verkuil, kernel, kernel-janitors, linux-media, linux-staging,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
linux-kernel
Hi Muhammad,
On Fri, Jan 28, 2022 at 10:38 AM Muhammad Usama Anjum
<usama.anjum@collabora.com> wrote:
>
> ret is constant in imx8mq_mipi_csi_pm_suspend(). This function cannot
> return error. Remove the return variable. Simplify other functions which
> are using this function.
>
> Fixes: f0c2ba1ed4ad ("media: imx: imx8mq-mipi_csi2: fix system resume")
The patch looks good.
I would suggest removing the Fixes tag though as this is more of a
clean-up rather than a bug fix.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] media: imx: imx8mq-mipi_csi2: Remove unneeded code
2022-01-28 16:23 ` Fabio Estevam
@ 2022-01-28 17:01 ` Muhammad Usama Anjum
0 siblings, 0 replies; 5+ messages in thread
From: Muhammad Usama Anjum @ 2022-01-28 17:01 UTC (permalink / raw)
To: Fabio Estevam
Cc: usama.anjum, Steve Longerbeam, Philipp Zabel,
Mauro Carvalho Chehab, Greg Kroah-Hartman, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, NXP Linux Team,
Martin Kepplinger, Hans Verkuil, kernel, kernel-janitors,
linux-media, linux-staging,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
linux-kernel
On 1/28/22 9:23 PM, Fabio Estevam wrote:
> Hi Muhammad,
>
> On Fri, Jan 28, 2022 at 10:38 AM Muhammad Usama Anjum
> <usama.anjum@collabora.com> wrote:
>>
>> ret is constant in imx8mq_mipi_csi_pm_suspend(). This function cannot
>> return error. Remove the return variable. Simplify other functions which
>> are using this function.
>>
>> Fixes: f0c2ba1ed4ad ("media: imx: imx8mq-mipi_csi2: fix system resume")
>
> The patch looks good.
>
> I would suggest removing the Fixes tag though as this is more of a
> clean-up rather than a bug fix.
I'll send a V2.
Thanks,
Usama
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-28 17:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-28 13:36 [PATCH] media: imx: imx8mq-mipi_csi2: Remove unneeded code Muhammad Usama Anjum
2022-01-28 13:52 ` Marc Kleine-Budde
2022-01-28 14:51 ` Muhammad Usama Anjum
2022-01-28 16:23 ` Fabio Estevam
2022-01-28 17:01 ` Muhammad Usama Anjum
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox