Commit 833e24ae authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-6.5-20230515' of... 

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

Marc Kleine-Budde says:

====================
pull-request: can-next 2023-05-15

The 1st patch is by Ji-Ze Hong and adds support for the Fintek F81604
USB-CAN adapter.

Jiapeng Chong's patch removes unnecessary dev_err() functions from the
bxcan driver.

The next patch is by me an makes a CAN internal header file self
contained.

The remaining 19 patches are by Uwe Kleine-König, they all convert the
platform driver remove callback to return void.

* tag 'linux-can-next-for-6.5-20230515' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (22 commits)
  can: xilinx: Convert to platform remove callback returning void
  can: ti_hecc: Convert to platform remove callback returning void
  can: sun4i_can: Convert to platform remove callback returning void
  can: softing: Convert to platform remove callback returning void
  can: sja1000_platform: Convert to platform remove callback returning void
  can: sja1000_isa: Convert to platform remove callback returning void
  can: rcar: Convert to platform remove callback returning void
  can: mscan: mpc5xxx_can: Convert to platform remove callback returning void
  can: m_can: Convert to platform remove callback returning void
  can: janz-ican3: Convert to platform remove callback returning void
  can: ifi_canfd: Convert to platform remove callback returning void
  can: grcan: Convert to platform remove callback returning void
  can: flexcan: Convert to platform remove callback returning void
  can: ctucanfd: Convert to platform remove callback returning void
  can: length: make header self contained
  can: cc770_platform: Convert to platform remove callback returning void
  can: bxcan: Remove unnecessary print function dev_err()
  can: cc770_isa: Convert to platform remove callback returning void
  can: usb: f81604: add Fintek F81604 support
  can: c_can: Convert to platform remove callback returning void
  ...
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e7480a44 2a3e1636

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7966,6 +7966,12 @@ S: Maintained 
F:	drivers/hwmon/f75375s.c

F:	include/linux/f75375s.h









FINTEK F81604 USB to 2xCANBUS DEVICE DRIVER









M:	Ji-Ze Hong (Peter Hong) <peter_hong@fintek.com.tw>









L:	linux-can@vger.kernel.org









S:	Maintained









F:	drivers/net/can/usb/f81604.c

















FIREWIRE AUDIO DRIVERS and IEC 61883-1/6 PACKET STREAMING ENGINE









M:	Clemens Ladisch <clemens@ladisch.de>









M:	Takashi Sakamoto <o-takashi@sakamocchi.jp>
































drivers/net/can/at91_can.c



+2
−4






























Original line number
Diff line number
Diff line







@@ -1346,7 +1346,7 @@ static int at91_can_probe(struct platform_device *pdev)







	return err;









}



















static int at91_can_remove(struct platform_device *pdev)









static void at91_can_remove(struct platform_device *pdev)









{









	struct net_device *dev = platform_get_drvdata(pdev);









	struct at91_priv *priv = netdev_priv(dev);








@@ -1362,8 +1362,6 @@ static int at91_can_remove(struct platform_device *pdev)







	clk_put(priv->clk);



















	free_candev(dev);



















	return 0;









}



















static const struct platform_device_id at91_can_id_table[] = {








@@ -1381,7 +1379,7 @@ MODULE_DEVICE_TABLE(platform, at91_can_id_table);

















static struct platform_driver at91_can_driver = {









	.probe = at91_can_probe,









	.remove = at91_can_remove,









	.remove_new = at91_can_remove,









	.driver = {









		.name = KBUILD_MODNAME,









		.of_match_table = of_match_ptr(at91_can_dt_ids),
































drivers/net/can/bxcan.c



+5
−12






























Original line number
Diff line number
Diff line







@@ -954,22 +954,16 @@ static int bxcan_probe(struct platform_device *pdev)







	}



















	rx_irq = platform_get_irq_byname(pdev, "rx0");









	if (rx_irq < 0) {









		dev_err(dev, "failed to get rx0 irq\n");









	if (rx_irq < 0)









		return rx_irq;









	}



















	tx_irq = platform_get_irq_byname(pdev, "tx");









	if (tx_irq < 0) {









		dev_err(dev, "failed to get tx irq\n");









	if (tx_irq < 0)









		return tx_irq;









	}



















	sce_irq = platform_get_irq_byname(pdev, "sce");









	if (sce_irq < 0) {









		dev_err(dev, "failed to get sce irq\n");









	if (sce_irq < 0)









		return sce_irq;









	}



















	ndev = alloc_candev(sizeof(struct bxcan_priv), BXCAN_TX_MB_NUM);









	if (!ndev) {








@@ -1027,7 +1021,7 @@ static int bxcan_probe(struct platform_device *pdev)







	return err;









}



















static int bxcan_remove(struct platform_device *pdev)









static void bxcan_remove(struct platform_device *pdev)









{









	struct net_device *ndev = platform_get_drvdata(pdev);









	struct bxcan_priv *priv = netdev_priv(ndev);








@@ -1036,7 +1030,6 @@ static int bxcan_remove(struct platform_device *pdev)







	clk_disable_unprepare(priv->clk);









	can_rx_offload_del(&priv->offload);









	free_candev(ndev);









	return 0;









}



















static int __maybe_unused bxcan_suspend(struct device *dev)








@@ -1088,7 +1081,7 @@ static struct platform_driver bxcan_driver = {







		.of_match_table = bxcan_of_match,









	},









	.probe = bxcan_probe,









	.remove = bxcan_remove,









	.remove_new = bxcan_remove,









};



















module_platform_driver(bxcan_driver);
































drivers/net/can/c_can/c_can_platform.c



+2
−4






























Original line number
Diff line number
Diff line







@@ -410,7 +410,7 @@ static int c_can_plat_probe(struct platform_device *pdev)







	return ret;









}



















static int c_can_plat_remove(struct platform_device *pdev)









static void c_can_plat_remove(struct platform_device *pdev)









{









	struct net_device *dev = platform_get_drvdata(pdev);









	struct c_can_priv *priv = netdev_priv(dev);








@@ -418,8 +418,6 @@ static int c_can_plat_remove(struct platform_device *pdev)







	unregister_c_can_dev(dev);









	pm_runtime_disable(priv->device);









	free_c_can_dev(dev);



















	return 0;









}



















#ifdef CONFIG_PM








@@ -487,7 +485,7 @@ static struct platform_driver c_can_plat_driver = {







		.of_match_table = c_can_of_table,









	},









	.probe = c_can_plat_probe,









	.remove = c_can_plat_remove,









	.remove_new = 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



+2
−4






























Original line number
Diff line number
Diff line







@@ -285,7 +285,7 @@ static int cc770_isa_probe(struct platform_device *pdev)







	return err;









}



















static int cc770_isa_remove(struct platform_device *pdev)









static void cc770_isa_remove(struct platform_device *pdev)









{









	struct net_device *dev = platform_get_drvdata(pdev);









	struct cc770_priv *priv = netdev_priv(dev);








@@ -303,13 +303,11 @@ static int cc770_isa_remove(struct platform_device *pdev)







			release_region(port[idx], CC770_IOSIZE);









	}









	free_cc770dev(dev);



















	return 0;









}



















static struct platform_driver cc770_isa_driver = {









	.probe = cc770_isa_probe,









	.remove = cc770_isa_remove,









	.remove_new = cc770_isa_remove,









	.driver = {









		.name = KBUILD_MODNAME,









	},