From: Samuil Ivanov <samuil.ivanovbg@gmail.com>
To: gregkh@linuxfoundation.org, manishc@marvell.com,
GR-Linux-NIC-Dev@marvell.com
Cc: samuil.ivanovbg@gmail.com, netdev@vger.kernel.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] Staging: qlge: Rename prefix of a function to qlge
Date: Fri, 25 Oct 2019 00:29:40 +0300 [thread overview]
Message-ID: <20191024212941.28149-3-samuil.ivanovbg@gmail.com> (raw)
In-Reply-To: <20191024212941.28149-1-samuil.ivanovbg@gmail.com>
Function ql_own_firmware renamed to
qlge_own_firmware and it's clients updated.
Signed-off-by: Samuil Ivanov <samuil.ivanovbg@gmail.com>
---
drivers/staging/qlge/qlge.h | 2 +-
drivers/staging/qlge/qlge_dbg.c | 2 +-
drivers/staging/qlge/qlge_mpi.c | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/qlge/qlge.h b/drivers/staging/qlge/qlge.h
index e9f1363c5bf2..d3f10c95c781 100644
--- a/drivers/staging/qlge/qlge.h
+++ b/drivers/staging/qlge/qlge.h
@@ -2280,7 +2280,7 @@ int ql_wait_fifo_empty(struct ql_adapter *qdev);
void ql_get_dump(struct ql_adapter *qdev, void *buff);
netdev_tx_t ql_lb_send(struct sk_buff *skb, struct net_device *ndev);
void ql_check_lb_frame(struct ql_adapter *, struct sk_buff *);
-int ql_own_firmware(struct ql_adapter *qdev);
+int qlge_own_firmware(struct ql_adapter *qdev);
int ql_clean_lb_rx_ring(struct rx_ring *rx_ring, int budget);
/* #define QL_ALL_DUMP */
diff --git a/drivers/staging/qlge/qlge_dbg.c b/drivers/staging/qlge/qlge_dbg.c
index df5344e113ca..82bca35543d3 100644
--- a/drivers/staging/qlge/qlge_dbg.c
+++ b/drivers/staging/qlge/qlge_dbg.c
@@ -1209,7 +1209,7 @@ int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump)
static void ql_get_core_dump(struct ql_adapter *qdev)
{
- if (!ql_own_firmware(qdev)) {
+ if (!qlge_own_firmware(qdev)) {
netif_err(qdev, drv, qdev->ndev, "Don't own firmware!\n");
return;
}
diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c
index efe893935929..ccffe0b256fa 100644
--- a/drivers/staging/qlge/qlge_mpi.c
+++ b/drivers/staging/qlge/qlge_mpi.c
@@ -101,7 +101,7 @@ int qlge_soft_reset_mpi_risc(struct ql_adapter *qdev)
* we are the higher function and the lower function
* is not enabled.
*/
-int ql_own_firmware(struct ql_adapter *qdev)
+int qlge_own_firmware(struct ql_adapter *qdev)
{
u32 temp;
@@ -122,7 +122,6 @@ int ql_own_firmware(struct ql_adapter *qdev)
return 1;
return 0;
-
}
static int ql_get_mb_sts(struct ql_adapter *qdev, struct mbox_params *mbcp)
@@ -1270,7 +1269,7 @@ void ql_mpi_reset_work(struct work_struct *work)
/* If we're not the dominant NIC function,
* then there is nothing to do.
*/
- if (!ql_own_firmware(qdev)) {
+ if (!qlge_own_firmware(qdev)) {
netif_err(qdev, drv, qdev->ndev, "Don't own firmware!\n");
return;
}
--
2.17.1
next prev parent reply other threads:[~2019-10-24 21:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 21:29 [PATCH 0/3] Staging: qlge: Rename of function prefix ql_ to qlge_ Samuil Ivanov
2019-10-24 21:29 ` [PATCH 1/3] Staging: qlge: Rename prefix of a function to qlge Samuil Ivanov
2019-10-25 10:19 ` Dan Carpenter
2019-10-25 14:28 ` Samuil Ivanov
2019-10-25 14:55 ` Dan Carpenter
2019-10-24 21:29 ` Samuil Ivanov [this message]
2019-10-24 21:29 ` [PATCH 3/3] " Samuil Ivanov
2019-10-25 3:17 ` [PATCH 0/3] Staging: qlge: Rename of function prefix ql_ to qlge_ Greg KH
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=20191024212941.28149-3-samuil.ivanovbg@gmail.com \
--to=samuil.ivanovbg@gmail.com \
--cc=GR-Linux-NIC-Dev@marvell.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manishc@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