net: ipa: rename interconnect settings

Use "bandwidth" rather than "rate" in describing the average and
peak values to use for IPA interconnects.  They should have been
named that way to begin with.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/ipa_clock.c b/drivers/net/ipa/ipa_clock.c
index 135c393437f127261366a66e7fd5fa214f0d1d1d..459c357e09678b2f61125f5847db725418b68890 100644 (file)
--- a/drivers/net/ipa/ipa_clock.c
+++ b/drivers/net/ipa/ipa_clock.c
@@ -109,20 +109,20 @@ static int ipa_interconnect_enable(struct ipa *ipa)
        int ret;
 
        data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY];
-       ret = icc_set_bw(clock->memory_path, data->average_rate,
-                        data->peak_rate);
+       ret = icc_set_bw(clock->memory_path, data->average_bandwidth,
+                        data->peak_bandwidth);
        if (ret)
                return ret;
 
        data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM];
-       ret = icc_set_bw(clock->imem_path, data->average_rate,
-                        data->peak_rate);
+       ret = icc_set_bw(clock->imem_path, data->average_bandwidth,
+                        data->peak_bandwidth);
        if (ret)
                goto err_memory_path_disable;
 
        data = &clock->interconnect_data[IPA_INTERCONNECT_CONFIG];
-       ret = icc_set_bw(clock->config_path, data->average_rate,
-                        data->peak_rate);
+       ret = icc_set_bw(clock->config_path, data->average_bandwidth,
+                        data->peak_bandwidth);
        if (ret)
                goto err_imem_path_disable;
 
@@ -159,12 +159,12 @@ static int ipa_interconnect_disable(struct ipa *ipa)
 
 err_imem_path_reenable:
        data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM];
-       (void)icc_set_bw(clock->imem_path, data->average_rate,
-                        data->peak_rate);
+       (void)icc_set_bw(clock->imem_path, data->average_bandwidth,
+                        data->peak_bandwidth);
 err_memory_path_reenable:
        data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY];
-       (void)icc_set_bw(clock->memory_path, data->average_rate,
-                        data->peak_rate);
+       (void)icc_set_bw(clock->memory_path, data->average_bandwidth,
+                        data->peak_bandwidth);
 
        return ret;
 }

diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c
index 5cc0ed77edb9ca4546c580ced405775ed2843f01..491572c0a34dceab9ba4609ce4eccc2308b0fc30 100644 (file)
--- a/drivers/net/ipa/ipa_data-sc7180.c
+++ b/drivers/net/ipa/ipa_data-sc7180.c
@@ -311,20 +311,20 @@ static struct ipa_mem_data ipa_mem_data = {
 
 static struct ipa_clock_data ipa_clock_data = {
        .core_clock_rate        = 100 * 1000 * 1000,    /* Hz */
-       /* Interconnect rates are in 1000 byte/second units */
+       /* Interconnect bandwidths are in 1000 byte/second units */
        .interconnect = {
                [IPA_INTERCONNECT_MEMORY] = {
-                       .peak_rate      = 465000,       /* 465 MBps */
-                       .average_rate   = 80000,        /* 80 MBps */
+                       .peak_bandwidth         = 465000,       /* 465 MBps */
+                       .average_bandwidth      = 80000,        /* 80 MBps */
                },
-               /* Average rate is unused for the next two interconnects */
+               /* Average bandwidth unused for the next two interconnects */
                [IPA_INTERCONNECT_IMEM] = {
-                       .peak_rate      = 68570,        /* 68.570 MBps */
-                       .average_rate   = 0,            /* unused */
+                       .peak_bandwidth         = 68570,        /* 68.57 MBps */
+                       .average_bandwidth      = 0,            /* unused */
                },
                [IPA_INTERCONNECT_CONFIG] = {
-                       .peak_rate      = 30000,        /* 30 MBps */
-                       .average_rate   = 0,            /* unused */
+                       .peak_bandwidth         = 30000,        /* 30 MBps */
+                       .average_bandwidth      = 0,            /* unused */
                },
        },
 };

diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c
index f8fee8d3ca42a5500ea0a71b9ab1a54412af3d14..c62b86171b929330f76417b4596b1da983daab35 100644 (file)
--- a/drivers/net/ipa/ipa_data-sdm845.c
+++ b/drivers/net/ipa/ipa_data-sdm845.c
@@ -331,20 +331,20 @@ static struct ipa_mem_data ipa_mem_data = {
 
 static struct ipa_clock_data ipa_clock_data = {
        .core_clock_rate        = 75 * 1000 * 1000,     /* Hz */
-       /* Interconnect rates are in 1000 byte/second units */
+       /* Interconnect bandwidths are in 1000 byte/second units */
        .interconnect = {
                [IPA_INTERCONNECT_MEMORY] = {
-                       .peak_rate      = 600000,       /* 600 MBps */
-                       .average_rate   = 80000,        /* 80 MBps */
+                       .peak_bandwidth         = 600000,       /* 600 MBps */
+                       .average_bandwidth      = 80000,        /* 80 MBps */
                },
-               /* Average rate is unused for the next two interconnects */
+               /* Average bandwidth unused for the next two interconnects */
                [IPA_INTERCONNECT_IMEM] = {
-                       .peak_rate      = 350000,       /* 350 MBps */
-                       .average_rate   = 0,            /* unused */
+                       .peak_bandwidth         = 350000,       /* 350 MBps */
+                       .average_bandwidth      = 0,            /* unused */
                },
                [IPA_INTERCONNECT_CONFIG] = {
-                       .peak_rate      = 40000,        /* 40 MBps */
-                       .average_rate   = 0,            /* unused */
+                       .peak_bandwidth         = 40000,        /* 40 MBps */
+                       .average_bandwidth      = 0,            /* unused */
                },
        },
 };

diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h
index 0ed5ffe2b8da0eea2fb1cbfdafa6a19bd5d07abb..96a9771a6cc05da4a8c97b580c730a6b4f1055d3 100644 (file)
--- a/drivers/net/ipa/ipa_data.h
+++ b/drivers/net/ipa/ipa_data.h
@@ -267,13 +267,13 @@ enum ipa_interconnect_id {
 };
 
 /**
- * struct ipa_interconnect_data - description of IPA interconnect rates
- * @peak_rate:         Peak interconnect bandwidth (in 1000 byte/sec units)
- * @average_rate:      Average interconnect bandwidth (in 1000 byte/sec units)
+ * struct ipa_interconnect_data - description of IPA interconnect bandwidths
+ * @peak_bandwidth:    Peak interconnect bandwidth (in 1000 byte/sec units)
+ * @average_bandwidth: Average interconnect bandwidth (in 1000 byte/sec units)
  */
 struct ipa_interconnect_data {
-       u32 peak_rate;
-       u32 average_rate;
+       u32 peak_bandwidth;
+       u32 average_bandwidth;
 };
 
 /**