Skip to content

Commit 4be430b

Browse files
Merge patch series "can: Kconfig: add missing COMPILE_TEST"
Vincent Mailhol <mailhol.vincent@wanadoo.fr> says: The ti_hecc and tscan1 CAN drivers can not be built on an x86_64 platform. Add the COMPILE_TEST dependency to allow build testing. Doing that, a so far unnoticed W=0 warning showed up in ti_hecc. Fix this warning. To prevent any potential noise in some future git bisect, the warning is fixed before introducing COMPILE_TEST. Note that the mscan and mpc5xxx drivers have the same issue but those two use some helper functions, such as in_8() and out_8(), which are only available on the powerpc platform. Those two drivers would require some deeper code refactor to be built on x86_64 and are thus left out of scope. Link: https://patch.msgid.link/20250715-can-compile-test-v2-0-f7fd566db86f@wanadoo.fr Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2 parents 21e9b7d + 5323af3 commit 4be430b

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/net/can/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ config CAN_SUN4I
201201
be called sun4i_can.
202202

203203
config CAN_TI_HECC
204-
depends on ARM
204+
depends on ARM || COMPILE_TEST
205205
tristate "TI High End CAN Controller"
206206
select CAN_RX_OFFLOAD
207207
help

drivers/net/can/sja1000/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ config CAN_SJA1000_PLATFORM
105105

106106
config CAN_TSCAN1
107107
tristate "TS-CAN1 PC104 boards"
108-
depends on ISA
108+
depends on ISA || (COMPILE_TEST && HAS_IOPORT)
109109
help
110110
This driver is for Technologic Systems' TSCAN-1 PC104 boards.
111111
https://www.embeddedts.com/products/TS-CAN1

drivers/net/can/ti_hecc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ static void ti_hecc_start(struct net_device *ndev)
383383
* overflows instead of the hardware silently dropping the
384384
* messages.
385385
*/
386-
mbx_mask = ~BIT(HECC_RX_LAST_MBOX);
386+
mbx_mask = ~BIT_U32(HECC_RX_LAST_MBOX);
387387
hecc_write(priv, HECC_CANOPC, mbx_mask);
388388

389389
/* Enable interrupts */

0 commit comments

Comments
 (0)