Merge tag 'asm-generic-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

[linux-block.git] / net / ax25 / af_ax25.c

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 6b4c25a9237746265158900ab92d7f411b77ab79..d8da400cb4de152db3825074c36ed61c6c101b7a 100644 (file)
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -723,7 +723,7 @@ static int ax25_getsockopt(struct socket *sock, int level, int optname,
        if (maxlen < 1)
                return -EFAULT;
 
-       valptr = (void *) &val;
+       valptr = &val;
        length = min_t(unsigned int, maxlen, sizeof(int));
 
        lock_sock(sk);
@@ -785,7 +785,7 @@ static int ax25_getsockopt(struct socket *sock, int level, int optname,
                        length = 1;
                }
 
-               valptr = (void *) devname;
+               valptr = devname;
                break;
 
        default: