Commit 06a104d5 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-6.12-20240911' of... 

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

Marc Kleine-Budde says:

====================
pull-request: can-next 2024-09-11

The first patch is by Uwe Kleine-König targets all CAN platform driver
and switches back the remove function to struct
platform_driver::remove().

A patch by Stefan Mätje fixes the help text of the ESD USB driver.

Jake Hamby's patch masks an unneeded interrupt in the m_can driver.

The last 2 patches target the rockchip_canfd driver. Arnd Bergmann's
patch reworks the delay calculation for the timekeeping worker, a
patch by me fixes the decoding of the error code register.

* tag 'linux-can-next-for-6.12-20240911' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next:
  can: rockchip_canfd: rkcanfd_handle_error_int_reg_ec(): fix decoding of error code register
  can: rockchip_canfd: rkcanfd_timestamp_init(): rework delay calculation
  can: m_can: m_can_chip_config(): mask timestamp wraparound IRQ
  can: usb: Kconfig: Fix list of devices for esd_usb driver
  can: Switch back to struct platform_driver::remove()
====================

Link: https://patch.msgid.link/20240912080438.2826895-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 37551b45 2b2a9a08

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ MODULE_DEVICE_TABLE(platform, at91_can_id_table); 


static struct platform_driver at91_can_driver = {

	.probe = at91_can_probe,

	.remove_new = at91_can_remove,

	.remove = at91_can_remove,

	.driver = {

		.name = KBUILD_MODNAME,

		.of_match_table = of_match_ptr(at91_can_dt_ids),

drivers/net/can/bxcan.c

+1 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ static struct platform_driver bxcan_driver = { 
		.of_match_table = bxcan_of_match,

	},

	.probe = bxcan_probe,

	.remove_new = bxcan_remove,

	.remove = bxcan_remove,

};



module_platform_driver(bxcan_driver);

drivers/net/can/c_can/c_can_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static struct platform_driver c_can_plat_driver = { 
		.of_match_table = c_can_of_table,

	},

	.probe = c_can_plat_probe,

	.remove_new = c_can_plat_remove,

	.remove = c_can_plat_remove,

	.suspend = c_can_suspend,

	.resume = c_can_resume,

	.id_table = c_can_id_table,

drivers/net/can/cc770/cc770_isa.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static void cc770_isa_remove(struct platform_device *pdev) 


static struct platform_driver cc770_isa_driver = {

	.probe = cc770_isa_probe,

	.remove_new = cc770_isa_remove,

	.remove = cc770_isa_remove,

	.driver = {

		.name = KBUILD_MODNAME,

	},

drivers/net/can/cc770/cc770_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static struct platform_driver cc770_platform_driver = { 
		.of_match_table = cc770_platform_table,

	},

	.probe = cc770_platform_probe,

	.remove_new = cc770_platform_remove,

	.remove = cc770_platform_remove,

};



module_platform_driver(cc770_platform_driver);