[PATCH RESEND] stm class: Remove unnecessary local variable in stm_write

[PATCH RESEND] stm class: Remove unnecessary local variable in stm_write

[Thorsten Blum]

The local variable 'err' and the corresponding if check in stm_write()
are unnecessary. Remove them.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 drivers/hwtracing/stm/core.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index cdba4e875b28..f3814e4ecf23 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -602,17 +602,11 @@ static ssize_t notrace
 stm_write(struct stm_device *stm, struct stm_output *output,
 	  unsigned int chan, const char *buf, size_t count, struct stm_source_data *source)
 {
-	int err;
-
 	/* stm->pdrv is serialized against policy_mutex */
 	if (!stm->pdrv)
 		return -ENODEV;
 
-	err = stm->pdrv->write(stm->data, output, chan, buf, count, source);
-	if (err < 0)
-		return err;
-
-	return err;
+	return stm->pdrv->write(stm->data, output, chan, buf, count, source);
 }
 
 static ssize_t stm_char_write(struct file *file, const char __user *buf,
-- 
Thorsten Blum <thorsten.blum@linux.dev>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4

Re: [PATCH RESEND] stm class: Remove unnecessary local variable in stm_write

[Alexander Shishkin]

Thorsten Blum <thorsten.blum@linux.dev> writes:

> The local variable 'err' and the corresponding if check in stm_write()
> are unnecessary. Remove them.

Nice catch! Is this a result of manual code inspection or were any tools
used, an AI agent or a coccinelle script or whatnot?

Thanks,
--
Alex

Re: [PATCH RESEND] stm class: Remove unnecessary local variable in stm_write

[Thorsten Blum]

On 26. Jan 2026, at 07:33, Alexander Shishkin wrote:
> Thorsten Blum <thorsten.blum@linux.dev> writes:
> 
>> The local variable 'err' and the corresponding if check in stm_write()
>> are unnecessary. Remove them.
> 
> Nice catch! Is this a result of manual code inspection or were any tools
> used, an AI agent or a coccinelle script or whatnot?

Manual code inspection. I think I stumbled upon it when I was working on

https://lore.kernel.org/lkml/20250909102512.694203-2-thorsten.blum@linux.dev/
https://lore.kernel.org/lkml/20250909102512.694203-4-thorsten.blum@linux.dev/

which are also still pending. Could you take a look at all three patches
while you're at it?

Thanks,
Thorsten

[PATCH RESEND] stm class: Remove unnecessary local variable in stm_write

[Thorsten Blum]

The local variable 'err' and the corresponding if check in stm_write()
are unnecessary. Remove them.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 drivers/hwtracing/stm/core.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index 37584e786bb5..4e0ee8e2e2c3 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -602,17 +602,11 @@ static ssize_t notrace
 stm_write(struct stm_device *stm, struct stm_output *output,
 	  unsigned int chan, const char *buf, size_t count, struct stm_source_data *source)
 {
-	int err;
-
 	/* stm->pdrv is serialized against policy_mutex */
 	if (!stm->pdrv)
 		return -ENODEV;
 
-	err = stm->pdrv->write(stm->data, output, chan, buf, count, source);
-	if (err < 0)
-		return err;
-
-	return err;
+	return stm->pdrv->write(stm->data, output, chan, buf, count, source);
 }
 
 static ssize_t stm_char_write(struct file *file, const char __user *buf,