xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

can: softing: softing_startstop(): fix set but not used variable warning

Browse Source 
[ 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: 03fd3cf5a1 ("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>
This commit is contained in:
Marc Kleine-Budde
2022-01-08 21:57:51 +01:00
committed by Greg Kroah-Hartman
parent b9ac866c23
commit b6dd1577bc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/can/softing/softing_fw.c
View File

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