]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
can: softing: softing_startstop(): fix set but not used variable warning
authorMarc Kleine-Budde <mkl@pengutronix.de>
Sat, 8 Jan 2022 20:57:51 +0000 (21:57 +0100)
committerPaolo Pisati <paolo.pisati@canonical.com>
Fri, 28 Jan 2022 09:59:55 +0000 (10:59 +0100)
BugLink: https://bugs.launchpad.net/bugs/1959376
[ Upstream commit 370d988cc529598ebaec6487d4f84c2115dc696b ]

In the function softing_startstop() the variable error_reporting is
assigned but not used. The code that uses this variable is commented
out. Its stated that the functionality is not finally verified.

To fix the warning:

| drivers/net/can/softing/softing_fw.c:424:9: error: variable 'error_reporting' set but not used [-Werror,-Wunused-but-set-variable]

remove the comment, activate the code, but add a "0 &&" to the if
expression and rely on the optimizer rather than the preprocessor to
remove the code.

Link: https://lore.kernel.org/all/20220109103126.1872833-1-mkl@pengutronix.de
Fixes: 03fd3cf5a179 ("can: add driver for Softing card")
Cc: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/net/can/softing/softing_fw.c

index 7e15368779931fa886cb1082dd860ca430650fce..32286f861a19561ef6ca8e52c71b2eb8cfc66811 100644 (file)
@@ -565,18 +565,19 @@ int softing_startstop(struct net_device *dev, int up)
                if (ret < 0)
                        goto failed;
        }
-       /* enable_error_frame */
-       /*
+
+       /* enable_error_frame
+        *
         * Error reporting is switched off at the moment since
         * the receiving of them is not yet 100% verified
         * This should be enabled sooner or later
-        *
-       if (error_reporting) {
+        */
+       if (0 && error_reporting) {
                ret = softing_fct_cmd(card, 51, "enable_error_frame");
                if (ret < 0)
                        goto failed;
        }
-       */
+
        /* initialize interface */
        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 2]);
        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 4]);