Re: [PATCH v6] can: kvaser_usb: make use of units.h in assignment of frequency

[Jimmy Assarsson <extja@xxxxxxxxxx>]

On 2021-12-10 08:58, Marc Kleine-Budde wrote:
> From: Jimmy Assarsson <extja@xxxxxxxxxx>
>
> Use the MEGA define plus the comment /* Hz */ when assigning
> frequencies.
>
> Signed-off-by: Jimmy Assarsson <extja@xxxxxxxxxx>
> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> ---
> Hello Jimmy,
>
> now that net/master has been merged into net-next/master, I think this
> is the remaining patch of your series. Right?
>
> regards,
> Marc

Yes.

Thanks!
jimmy


>   drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 7 ++++---
>   drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c  | 9 +++++----
>   2 files changed, 9 insertions(+), 7 deletions(-)
>
> 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 dcee8dc828ec..cec36295fdc5 100644
> --- 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>
> @@ -2040,7 +2041,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,
> @@ -2049,7 +2050,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_hydra_flexc_bittiming_c,
> @@ -2057,7 +2058,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 f7af1bf5ab46..aed271d5f3bb 100644
> --- 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>
> @@ -356,7 +357,7 @@ static const struct can_bittiming_const kvaser_usb_leaf_bittiming_const = {
>   
>   static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg_8mhz = {
>   	.clock = {
> -		.freq = 8000000,
> +		.freq = 8 * MEGA /* Hz */,
>   	},
>   	.timestamp_freq = 1,
>   	.bittiming_const = &kvaser_usb_leaf_bittiming_const,
> @@ -364,7 +365,7 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg_8mhz = {
>   
>   static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg_16mhz = {
>   	.clock = {
> -		.freq = 16000000,
> +		.freq = 16 * MEGA /* Hz */,
>   	},
>   	.timestamp_freq = 1,
>   	.bittiming_const = &kvaser_usb_leaf_bittiming_const,
> @@ -372,7 +373,7 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg_16mhz = {
>   
>   static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg_24mhz = {
>   	.clock = {
> -		.freq = 24000000,
> +		.freq = 24 * MEGA /* Hz */,
>   	},
>   	.timestamp_freq = 1,
>   	.bittiming_const = &kvaser_usb_leaf_bittiming_const,
> @@ -380,7 +381,7 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg_24mhz = {
>   
>   static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg_32mhz = {
>   	.clock = {
> -		.freq = 32000000,
> +		.freq = 32 * MEGA /* Hz */,
>   	},
>   	.timestamp_freq = 1,
>   	.bittiming_const = &kvaser_usb_leaf_bittiming_const,