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.
113 lines
3.7 KiB
113 lines
3.7 KiB
From a655a8ee2811ddecdb2097cb9d715107cab560d6 Mon Sep 17 00:00:00 2001
|
|
From: Igor Russkikh <irusskik@redhat.com>
|
|
Date: Fri, 6 Nov 2020 18:37:04 -0500
|
|
Subject: [PATCH 047/139] [netdrv] net: atlantic: stylistic renames
|
|
|
|
Message-id: <1604687916-15087-48-git-send-email-irusskik@redhat.com>
|
|
Patchwork-id: 338472
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.4 BZ 1857861 047/139] net: atlantic: stylistic renames
|
|
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 ddef55263271cd7108db3821c376e7104ba7cc5f
|
|
Author: Igor Russkikh <irusskikh@marvell.com>
|
|
Date: Thu Nov 7 22:42:02 2019 +0000
|
|
|
|
net: atlantic: stylistic renames
|
|
|
|
We are trying to follow the naming of the chip (atlantic), not
|
|
company. So replace some old namings.
|
|
|
|
Signed-off-by: Nikita Danilov <ndanilov@marvell.com>
|
|
Signed-off-by: Igor Russkikh <irusskikh@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_ptp.c | 6 +++---
|
|
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h | 8 ++++----
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
|
|
index 1f9eab74453e..58e8c641e8b3 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
|
|
@@ -1057,7 +1057,7 @@ static struct ptp_clock_info aq_ptp_clock = {
|
|
ptp_offset[__idx].ingress = (__ingress); } \
|
|
while (0)
|
|
|
|
-static void aq_ptp_offset_init_from_fw(const struct hw_aq_ptp_offset *offsets)
|
|
+static void aq_ptp_offset_init_from_fw(const struct hw_atl_ptp_offset *offsets)
|
|
{
|
|
int i;
|
|
|
|
@@ -1098,7 +1098,7 @@ static void aq_ptp_offset_init_from_fw(const struct hw_aq_ptp_offset *offsets)
|
|
}
|
|
}
|
|
|
|
-static void aq_ptp_offset_init(const struct hw_aq_ptp_offset *offsets)
|
|
+static void aq_ptp_offset_init(const struct hw_atl_ptp_offset *offsets)
|
|
{
|
|
memset(ptp_offset, 0, sizeof(ptp_offset));
|
|
|
|
@@ -1106,7 +1106,7 @@ static void aq_ptp_offset_init(const struct hw_aq_ptp_offset *offsets)
|
|
}
|
|
|
|
static void aq_ptp_gpio_init(struct ptp_clock_info *info,
|
|
- struct hw_aq_info *hw_info)
|
|
+ struct hw_atl_info *hw_info)
|
|
{
|
|
struct ptp_pin_desc pin_desc[MAX_PTP_GPIO_COUNT];
|
|
u32 extts_pin_cnt = 0;
|
|
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 68fe17ec171d..42f0c5c6ec2d 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
|
|
@@ -113,7 +113,7 @@ struct __packed hw_atl_utils_mbox_header {
|
|
u32 error;
|
|
};
|
|
|
|
-struct __packed hw_aq_ptp_offset {
|
|
+struct __packed hw_atl_ptp_offset {
|
|
u16 ingress_100;
|
|
u16 egress_100;
|
|
u16 ingress_1000;
|
|
@@ -148,14 +148,14 @@ enum gpio_pin_function {
|
|
GPIO_PIN_FUNCTION_SIZE
|
|
};
|
|
|
|
-struct __packed hw_aq_info {
|
|
+struct __packed hw_atl_info {
|
|
u8 reserved[6];
|
|
u16 phy_fault_code;
|
|
u16 phy_temperature;
|
|
u8 cable_len;
|
|
u8 reserved1;
|
|
struct hw_atl_cable_diag cable_diag_data[4];
|
|
- struct hw_aq_ptp_offset ptp_offset;
|
|
+ struct hw_atl_ptp_offset ptp_offset;
|
|
u8 reserved2[12];
|
|
u32 caps_lo;
|
|
u32 caps_hi;
|
|
@@ -177,7 +177,7 @@ struct __packed hw_aq_info {
|
|
struct __packed hw_atl_utils_mbox {
|
|
struct hw_atl_utils_mbox_header header;
|
|
struct hw_atl_stats_s stats;
|
|
- struct hw_aq_info info;
|
|
+ struct hw_atl_info info;
|
|
};
|
|
|
|
struct __packed offload_ip_info {
|
|
--
|
|
2.13.6
|
|
|