Subject: [PATCH] openvswitch: meter: Remove unnecessary int

From: Solomon Tan <[email-masked]>
Date: Mon, 18 Apr 2022 00:50:12 +0000

This patch addresses the checkpatch.pl warning that long long is
preferred over long long int.

Signed-off-by: Solomon Tan <[email-masked]>
---
 net/openvswitch/meter.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 04a060ac7fdf..a790920c11d6 100644
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -592,8 +592,8 @@ static int ovs_meter_cmd_del(struct sk_buff *skb, struct genl_info *info)
 bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,
 		       struct sw_flow_key *key, u32 meter_id)
 {
-	long long int now_ms = div_u64(ktime_get_ns(), 1000 * 1000);
-	long long int long_delta_ms;
+	long long now_ms = div_u64(ktime_get_ns(), 1000 * 1000);
+	long long long_delta_ms;
 	struct dp_meter_band *band;
 	struct dp_meter *meter;
 	int i, band_exceeded_max = -1;
@@ -622,7 +622,7 @@ bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,
 	/* Make sure delta_ms will not be too large, so that bucket will not
 	 * wrap around below.
 	 */
-	delta_ms = (long_delta_ms > (long long int)meter->max_delta_t)
+	delta_ms = (long_delta_ms > (long long)meter->max_delta_t)
 		   ? meter->max_delta_t : (u32)long_delta_ms;

 	/* Update meter statistics.
@@ -645,7 +645,7 @@ bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,

 	/* Update all bands and find the one hit with the highest rate. */
 	for (i = 0; i < meter->n_bands; ++i) {
-		long long int max_bucket_size;
+		long long max_bucket_size;

 		band = &meter->bands[i];
 		max_bucket_size = band->burst_size * 1000LL;
--
2.35.3