diff options
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/bxcan.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/c_can/c_can_platform.c | 4 | ||||
| -rw-r--r-- | drivers/net/can/flexcan/flexcan-core.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/ifi_canfd/ifi_canfd.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/m_can/m_can_platform.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/f81601.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/sja1000_platform.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/slcan/slcan-core.c | 5 |
8 files changed, 9 insertions, 12 deletions
diff --git a/drivers/net/can/bxcan.c b/drivers/net/can/bxcan.c index baf494d20bef..4bddd015775b 100644 --- a/drivers/net/can/bxcan.c +++ b/drivers/net/can/bxcan.c @@ -1080,7 +1080,7 @@ static SIMPLE_DEV_PM_OPS(bxcan_pm_ops, bxcan_suspend, bxcan_resume); static const struct of_device_id bxcan_of_match[] = { {.compatible = "st,stm32f4-bxcan"}, - { /* sentinel */ }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, bxcan_of_match); diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index 19c86b94a40e..75607b1afd2e 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -239,7 +239,7 @@ static const struct platform_device_id c_can_id_table[] = { .name = "d_can", .driver_data = (kernel_ulong_t)&d_can_drvdata, }, - { /* sentinel */ }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(platform, c_can_id_table); @@ -249,7 +249,7 @@ static const struct of_device_id c_can_of_table[] = { { .compatible = "ti,dra7-d_can", .data = &dra7_dcan_drvdata }, { .compatible = "ti,am3352-d_can", .data = &am3352_dcan_drvdata }, { .compatible = "ti,am4372-d_can", .data = &am3352_dcan_drvdata }, - { /* sentinel */ }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, c_can_of_table); diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c index f5d22c61503f..86b40abe9e76 100644 --- a/drivers/net/can/flexcan/flexcan-core.c +++ b/drivers/net/can/flexcan/flexcan-core.c @@ -2070,7 +2070,7 @@ static const struct of_device_id flexcan_of_match[] = { { .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, }, { .compatible = "fsl,lx2160ar1-flexcan", .data = &fsl_lx2160a_r1_devtype_data, }, { .compatible = "nxp,s32g2-flexcan", .data = &nxp_s32g2_devtype_data, }, - { /* sentinel */ }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, flexcan_of_match); diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c index 0f83335e4d07..9eecfe5a87bd 100644 --- a/drivers/net/can/ifi_canfd/ifi_canfd.c +++ b/drivers/net/can/ifi_canfd/ifi_canfd.c @@ -1044,7 +1044,7 @@ static void ifi_canfd_plat_remove(struct platform_device *pdev) static const struct of_device_id ifi_canfd_of_table[] = { { .compatible = "ifi,canfd-1.0", .data = NULL }, - { /* sentinel */ }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, ifi_canfd_of_table); diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c index 56da411878af..51dd41dbf2c9 100644 --- a/drivers/net/can/m_can/m_can_platform.c +++ b/drivers/net/can/m_can/m_can_platform.c @@ -220,7 +220,7 @@ static const struct dev_pm_ops m_can_pmops = { static const struct of_device_id m_can_of_table[] = { { .compatible = "bosch,m_can", .data = NULL }, - { /* sentinel */ }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, m_can_of_table); diff --git a/drivers/net/can/sja1000/f81601.c b/drivers/net/can/sja1000/f81601.c index 8f25e95814ef..18cf170db457 100644 --- a/drivers/net/can/sja1000/f81601.c +++ b/drivers/net/can/sja1000/f81601.c @@ -40,7 +40,7 @@ struct f81601_pci_card { static const struct pci_device_id f81601_pci_tbl[] = { { PCI_DEVICE(0x1c29, 0x1703) }, - { /* sentinel */ }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(pci, f81601_pci_tbl); diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c index 2d555f854008..da4e1c820b6e 100644 --- a/drivers/net/can/sja1000/sja1000_platform.c +++ b/drivers/net/can/sja1000/sja1000_platform.c @@ -207,7 +207,7 @@ static const struct of_device_id sp_of_table[] = { { .compatible = "nxp,sja1000", .data = NULL, }, { .compatible = "renesas,rzn1-sja1000", .data = &renesas_data, }, { .compatible = "technologic,sja1000", .data = &technologic_data, }, - { /* sentinel */ }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sp_of_table); diff --git a/drivers/net/can/slcan/slcan-core.c b/drivers/net/can/slcan/slcan-core.c index 7439849d5c84..c9414faafe66 100644 --- a/drivers/net/can/slcan/slcan-core.c +++ b/drivers/net/can/slcan/slcan-core.c @@ -131,10 +131,7 @@ int slcan_enable_err_rst_on_open(struct net_device *ndev, bool on) if (netif_running(ndev)) return -EBUSY; - if (on) - set_bit(CF_ERR_RST, &sl->cmd_flags); - else - clear_bit(CF_ERR_RST, &sl->cmd_flags); + assign_bit(CF_ERR_RST, &sl->cmd_flags, on); return 0; } |