You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
116 lines
4.5 KiB
116 lines
4.5 KiB
From ba4ed1ff3c457654440d3460e3da4fe99d4a775e Mon Sep 17 00:00:00 2001
|
|
From: Igor Russkikh <irusskik@redhat.com>
|
|
Date: Fri, 6 Nov 2020 18:37:31 -0500
|
|
Subject: [PATCH 074/139] [netdrv] net: atlantic: simplify hw_get_fw_version()
|
|
usage
|
|
|
|
Message-id: <1604687916-15087-75-git-send-email-irusskik@redhat.com>
|
|
Patchwork-id: 338499
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.4 BZ 1857861 074/139] net: atlantic: simplify hw_get_fw_version() usage
|
|
Bugzilla: 1857861
|
|
RH-Acked-by: David Arcari <darcari@redhat.com>
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1857861
|
|
|
|
commit 36e90a5297ea02c67c0f17d8b39eb9ceb93dd6f0
|
|
Author: Nikita Danilov <ndanilov@marvell.com>
|
|
Date: Thu Apr 30 11:04:33 2020 +0300
|
|
|
|
net: atlantic: simplify hw_get_fw_version() usage
|
|
|
|
hw_get_fw_version() never fails, so this patch simplifies its
|
|
usage by utilizing return value instead of output argument.
|
|
|
|
Signed-off-by: Nikita Danilov <ndanilov@marvell.com>
|
|
Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
Signed-off-by: Igor Russkikh <irusskik@redhat.com>
|
|
|
|
Cc: David Arcari <darcari@redhat.com>
|
|
Cc: Igor Russkikh <irusskik@redhat.com>
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
---
|
|
drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 2 +-
|
|
drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 6 +-----
|
|
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 8 +++-----
|
|
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h | 2 +-
|
|
4 files changed, 6 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
|
|
index fda665280937..e7a253667336 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
|
|
@@ -259,7 +259,7 @@ struct aq_hw_ops {
|
|
|
|
struct aq_stats_s *(*hw_get_hw_stats)(struct aq_hw_s *self);
|
|
|
|
- int (*hw_get_fw_version)(struct aq_hw_s *self, u32 *fw_version);
|
|
+ u32 (*hw_get_fw_version)(struct aq_hw_s *self);
|
|
|
|
int (*hw_set_offload)(struct aq_hw_s *self,
|
|
struct aq_nic_cfg_s *aq_nic_cfg);
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
|
|
index 69016ae108b2..6d02e40b43a4 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
|
|
@@ -1016,11 +1016,7 @@ struct aq_nic_cfg_s *aq_nic_get_cfg(struct aq_nic_s *self)
|
|
|
|
u32 aq_nic_get_fw_version(struct aq_nic_s *self)
|
|
{
|
|
- u32 fw_version = 0U;
|
|
-
|
|
- self->aq_hw_ops->hw_get_fw_version(self->aq_hw, &fw_version);
|
|
-
|
|
- return fw_version;
|
|
+ return self->aq_hw_ops->hw_get_fw_version(self->aq_hw);
|
|
}
|
|
|
|
int aq_nic_set_loopback(struct aq_nic_s *self)
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
|
|
index 7259bcb81e9b..bd1712ca9ef2 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
|
|
@@ -70,7 +70,7 @@ int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)
|
|
hw_atl_utils_hw_chip_features_init(self,
|
|
&self->chip_features);
|
|
|
|
- hw_atl_utils_get_fw_version(self, &self->fw_ver_actual);
|
|
+ self->fw_ver_actual = hw_atl_utils_get_fw_version(self);
|
|
|
|
if (hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,
|
|
self->fw_ver_actual) == 0) {
|
|
@@ -915,11 +915,9 @@ int hw_atl_utils_hw_get_regs(struct aq_hw_s *self,
|
|
return 0;
|
|
}
|
|
|
|
-int hw_atl_utils_get_fw_version(struct aq_hw_s *self, u32 *fw_version)
|
|
+u32 hw_atl_utils_get_fw_version(struct aq_hw_s *self)
|
|
{
|
|
- *fw_version = aq_hw_read_reg(self, 0x18U);
|
|
-
|
|
- return 0;
|
|
+ return aq_hw_read_reg(self, HW_ATL_MPI_FW_VERSION);
|
|
}
|
|
|
|
static int aq_fw1x_set_wake_magic(struct aq_hw_s *self, bool wol_enabled,
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
|
|
index 6b4f701e7006..ed3f0307652d 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
|
|
@@ -587,7 +587,7 @@ int hw_atl_utils_hw_set_power(struct aq_hw_s *self,
|
|
|
|
int hw_atl_utils_hw_deinit(struct aq_hw_s *self);
|
|
|
|
-int hw_atl_utils_get_fw_version(struct aq_hw_s *self, u32 *fw_version);
|
|
+u32 hw_atl_utils_get_fw_version(struct aq_hw_s *self);
|
|
|
|
int hw_atl_utils_update_stats(struct aq_hw_s *self);
|
|
|
|
--
|
|
2.13.6
|
|
|