Commit 1c990729 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-5.15-20210907' of... 

Merge tag 'linux-can-fixes-for-5.15-20210907' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



linux-can-fixes-for-5.15-20210907

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8f110f35 644d0a5b

drivers/net/can/c_can/c_can_ethtool.c

+1 −3
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@ static void c_can_get_drvinfo(struct net_device *netdev, 
			      struct ethtool_drvinfo *info)

{

	struct c_can_priv *priv = netdev_priv(netdev);

	struct platform_device *pdev = to_platform_device(priv->device);



	strscpy(info->driver, "c_can", sizeof(info->driver));

	strscpy(info->bus_info, pdev->name, sizeof(info->bus_info));

	strscpy(info->bus_info, dev_name(priv->device), sizeof(info->bus_info));

}



static void c_can_get_ringparam(struct net_device *netdev,

drivers/net/can/rcar/rcar_canfd.c

+1 −1
Original line number Diff line number Diff line
@@ -2017,7 +2017,7 @@ static int __maybe_unused rcar_canfd_resume(struct device *dev) 
static SIMPLE_DEV_PM_OPS(rcar_canfd_pm_ops, rcar_canfd_suspend,

			 rcar_canfd_resume);



static const struct of_device_id rcar_canfd_of_table[] = {

static const __maybe_unused struct of_device_id rcar_canfd_of_table[] = {

	{ .compatible = "renesas,rcar-gen3-canfd", .data = (void *)RENESAS_RCAR_GEN3 },

	{ .compatible = "renesas,rzg2l-canfd", .data = (void *)RENESAS_RZG2L },

	{ }