can: kvaser_usb: make use of units.h in assignment of frequency

[ Upstream commit b8f91799687eeb6ffe73b66420db46d8c0292295 ]

Use the MEGA define plus the comment /* Hz */ when assigning
frequencies.

Link: https://lore.kernel.org/all/20211210075803.343841-1-mkl@pengutronix.de
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Stable-dep-of: 8d21f5927ae6 ("can: kvaser_usb_leaf: Fix improved state not being reported")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
index 215f2b4..b485f0b 100644 (file)
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
@@ -22,6 +22,7 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/units.h>
 #include <linux/usb.h>
 
 #include <linux/can.h>
@@ -2049,7 +2050,7 @@ const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops = {
 
 static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_kcan = {
        .clock = {
-               .freq = 80000000,
+               .freq = 80 * MEGA /* Hz */,
        },
        .timestamp_freq = 80,
        .bittiming_const = &kvaser_usb_hydra_kcan_bittiming_c,
@@ -2058,7 +2059,7 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_kcan = {
 
 static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc = {
        .clock = {
-               .freq = 24000000,
+               .freq = 24 * MEGA /* Hz */,
        },
        .timestamp_freq = 1,
        .bittiming_const = &kvaser_usb_flexc_bittiming_const,
@@ -2066,7 +2067,7 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc = {
 
 static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt = {
        .clock = {
-               .freq = 80000000,
+               .freq = 80 * MEGA /* Hz */,
        },
        .timestamp_freq = 24,
        .bittiming_const = &kvaser_usb_hydra_rt_bittiming_c,

diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
index a653318..6d64d56 100644 (file)
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
@@ -19,6 +19,7 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/units.h>
 #include <linux/usb.h>
 
 #include <linux/can.h>
@@ -446,7 +447,7 @@ static const struct can_bittiming_const kvaser_usb_leaf_m32c_bittiming_const = {
 
 static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_usbcan_dev_cfg = {
        .clock = {
-               .freq = 8000000,
+               .freq = 8 * MEGA /* Hz */,
        },
        .timestamp_freq = 1,
        .bittiming_const = &kvaser_usb_leaf_m16c_bittiming_const,
@@ -454,7 +455,7 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_usbcan_dev_cfg = {
 
 static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_m32c_dev_cfg = {
        .clock = {
-               .freq = 16000000,
+               .freq = 16 * MEGA /* Hz */,
        },
        .timestamp_freq = 1,
        .bittiming_const = &kvaser_usb_leaf_m32c_bittiming_const,
@@ -470,7 +471,7 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_imx_dev_cfg_16mhz = {
 
 static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_imx_dev_cfg_24mhz = {
        .clock = {
-               .freq = 24000000,
+               .freq = 24 * MEGA /* Hz */,
        },
        .timestamp_freq = 1,
        .bittiming_const = &kvaser_usb_flexc_bittiming_const,
@@ -478,7 +479,7 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_imx_dev_cfg_24mhz = {
 
 static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_imx_dev_cfg_32mhz = {
        .clock = {
-               .freq = 32000000,
+               .freq = 32 * MEGA /* Hz */,
        },
        .timestamp_freq = 1,
        .bittiming_const = &kvaser_usb_flexc_bittiming_const,