[PATCH] net: ppp: remove error variable

[PATCH] net: ppp: remove error variable

[Li Jun]

the error variable did not function as a variable.
so remove it.

Signed-off-by: Li Jun <lijun01@kylinos.cn>
---
 drivers/net/ppp/pptp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index 5feaa70b5f47..67239476781e 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -501,7 +501,6 @@ static int pptp_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
 	struct pppox_sock *po;
-	int error = 0;
 
 	if (!sk)
 		return 0;
@@ -526,7 +525,7 @@ static int pptp_release(struct socket *sock)
 	release_sock(sk);
 	sock_put(sk);
 
-	return error;
+	return 0;
 }
 
 static void pptp_sock_destruct(struct sock *sk)
-- 
2.25.1

[PATCH] net: ppp: remove error variable

[Li Jun]

the error variable did not function as a variable.
so remove it.

Signed-off-by: Li Jun <lijun01@kylinos.cn>
---
 drivers/net/ppp/pptp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index 5feaa70b5f47..67239476781e 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -501,7 +501,6 @@ static int pptp_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
 	struct pppox_sock *po;
-	int error = 0;
 
 	if (!sk)
 		return 0;
@@ -526,7 +525,7 @@ static int pptp_release(struct socket *sock)
 	release_sock(sk);
 	sock_put(sk);
 
-	return error;
+	return 0;
 }
 
 static void pptp_sock_destruct(struct sock *sk)
-- 
2.25.1

Re: [PATCH] net: ppp: remove error variable

[Michal Swiatkowski]

On Fri, May 30, 2025 at 10:48:50AM +0800, Li Jun wrote:
> the error variable did not function as a variable.
> so remove it.
> 
> Signed-off-by: Li Jun <lijun01@kylinos.cn>

Hi,

net-next is closed till the 9 June. Plese resend when open.
I assuming you don't want to target it to net, as you don't have fixes
tag and this is cosmetic refactor, not a real issue.

Thanks

> ---
>  drivers/net/ppp/pptp.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
> index 5feaa70b5f47..67239476781e 100644
> --- a/drivers/net/ppp/pptp.c
> +++ b/drivers/net/ppp/pptp.c
> @@ -501,7 +501,6 @@ static int pptp_release(struct socket *sock)
>  {
>  	struct sock *sk = sock->sk;
>  	struct pppox_sock *po;
> -	int error = 0;
>  
>  	if (!sk)
>  		return 0;
> @@ -526,7 +525,7 @@ static int pptp_release(struct socket *sock)
>  	release_sock(sk);
>  	sock_put(sk);
>  
> -	return error;
> +	return 0;
>  }
>  
>  static void pptp_sock_destruct(struct sock *sk)
> -- 
> 2.25.1

Re: [PATCH] net: ppp: remove error variable

[Simon Horman]

On Fri, May 30, 2025 at 10:50:40AM +0800, Li Jun wrote:
> the error variable did not function as a variable.
> so remove it.
> 
> Signed-off-by: Li Jun <lijun01@kylinos.cn>

Hi Li Jun,

Overall your patch looks good to me but as a cleanup for Networking
code it would be best to explicitly target net-next like this:

	Subject: [PATCH net-next] ...

But more importantly, net-next is currently closed, so please
repost your patch once it re-opens.

For reference, information on the development process can be found here.
https://docs.kernel.org/process/maintainer-netdev.html


## Form letter - net-next-closed

The merge window for v6.16 has begun and therefore net-next is closed
for new drivers, features, code refactoring and optimizations. We are
currently accepting bug fixes only.

Please repost when net-next reopens after June 8th.

RFC patches sent for review only are obviously welcome at any time.

-- 
pw-bot: defer