Commit 9fa87dd2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-5.19-20220523' of... 

Merge tag 'linux-can-next-for-5.19-20220523' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2022-05-23

this is a pull request of 3 patches for net-next/master.

The first patch is by Julia Lawall and fixes a typo in the peak_usb
driver.

Jakub Kicinski contributes a patch for the kvaser_usb driver to
silence a GCC 12 -Warray-bounds warning.

The last patch is by me, target the ctucanfd platform driver and adds
a missing dependency to HAS_IOMEM.

* tag 'linux-can-next-for-5.19-20220523' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next:
  can: ctucanfd: platform: add missing dependency to HAS_IOMEM
  can: kvaser_usb: silence a GCC 12 -Warray-bounds warning
  can: peak_usb: fix typo in comment
====================

Link: https://lore.kernel.org/r/20220523201045.1708855-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b1e6738a 8f445a3e

drivers/net/can/ctucanfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ config CAN_CTUCANFD_PCI 


config CAN_CTUCANFD_PLATFORM

	tristate "CTU CAN-FD IP core platform (FPGA, SoC) driver"

	depends on OF || COMPILE_TEST

	depends on HAS_IOMEM && (OF || COMPILE_TEST)

	select CAN_CTUCANFD

	help

	  The core has been tested together with OpenCores SJA1000

drivers/net/can/usb/kvaser_usb/Makefile

+5 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_CAN_KVASER_USB) += kvaser_usb.o

kvaser_usb-y = kvaser_usb_core.o kvaser_usb_leaf.o kvaser_usb_hydra.o



# FIXME: temporarily silence -Warray-bounds on non W=1+ builds

ifndef KBUILD_EXTRA_WARN

CFLAGS_kvaser_usb_hydra.o += -Wno-array-bounds

endif

drivers/net/can/usb/peak_usb/pcan_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ static int pcan_usb_handle_bus_evt(struct pcan_usb_msg_context *mc, u8 ir) 
{

	struct pcan_usb *pdev = mc->pdev;



	/* acccording to the content of the packet */

	/* according to the content of the packet */

	switch (ir) {

	case PCAN_USB_ERR_CNT_DEC:

	case PCAN_USB_ERR_CNT_INC: