From: Igor Russkikh <irusskikh@marvell.com>
To: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc: "David S . Miller" <davem@davemloft.net>,
Igor Russkikh <irusskikh@marvell.com>,
Nikita Danilov <ndanilov@marvell.com>
Subject: [PATCH v2 net-next 09/12] net: atlantic: stylistic renames
Date: Thu, 7 Nov 2019 22:42:02 +0000 [thread overview]
Message-ID: <e0f0a58265d303136dae45439f7f1457665bd7be.1573158382.git.irusskikh@marvell.com> (raw)
In-Reply-To: <cover.1573158381.git.irusskikh@marvell.com>
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>
---
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 6 +++---
.../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 bb6fbbadfd47..f00663e89cc5 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
@@ -1055,7 +1055,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;
@@ -1096,7 +1096,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));
@@ -1104,7 +1104,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.17.1
next prev parent reply other threads:[~2019-11-07 22:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 22:41 [PATCH v2 net-next 00/12] Aquantia Marvell atlantic driver updates 11-2019 Igor Russkikh
2019-11-07 22:41 ` [PATCH v2 net-next 01/12] net: atlantic: update firmware interface Igor Russkikh
2019-11-07 22:41 ` [PATCH v2 net-next 02/12] net: atlantic: implement wake_phy feature Igor Russkikh
2019-11-07 22:41 ` [PATCH v2 net-next 03/12] net: atlantic: refactoring pm logic Igor Russkikh
2019-11-07 22:41 ` [PATCH v2 net-next 04/12] net: atlantic: add msglevel configuration Igor Russkikh
2019-11-07 22:41 ` [PATCH v2 net-next 05/12] net: atlantic: adding ethtool physical identification Igor Russkikh
2019-11-07 22:41 ` [PATCH v2 net-next 06/12] net: atlantic: add fw configuration memory area Igor Russkikh
2019-11-07 22:41 ` [PATCH v2 net-next 07/12] net: atlantic: loopback tests via private flags Igor Russkikh
2019-11-08 3:55 ` David Miller
2019-11-07 22:42 ` [PATCH v2 net-next 08/12] net: atlantic: code style cleanup Igor Russkikh
2019-11-07 22:42 ` Igor Russkikh [this message]
2019-11-07 22:42 ` [PATCH v2 net-next 10/12] net: atlantic: update flow control logic Igor Russkikh
2019-11-07 22:42 ` [PATCH v2 net-next 11/12] net: atlantic: implement UDP GSO offload Igor Russkikh
2019-11-07 22:42 ` [PATCH v2 net-next 12/12] net: atlantic: change email domains to Marvell Igor Russkikh
2019-11-08 3:55 ` [PATCH v2 net-next 00/12] Aquantia Marvell atlantic driver updates 11-2019 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e0f0a58265d303136dae45439f7f1457665bd7be.1573158382.git.irusskikh@marvell.com \
--to=irusskikh@marvell.com \
--cc=davem@davemloft.net \
--cc=ndanilov@marvell.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).