* [PATCH 1/3] Staging: qlge: Rename prefix of a function to qlge
2019-10-24 21:29 [PATCH 0/3] Staging: qlge: Rename of function prefix ql_ to qlge_ Samuil Ivanov
@ 2019-10-24 21:29 ` Samuil Ivanov
2019-10-25 10:19 ` Dan Carpenter
2019-10-24 21:29 ` [PATCH 2/3] " Samuil Ivanov
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Samuil Ivanov @ 2019-10-24 21:29 UTC (permalink / raw)
To: gregkh, manishc, GR-Linux-NIC-Dev; +Cc: devel, netdev, linux-kernel
This is from the TODO list:
In terms of namespace, the driver uses either qlge_, ql_ (used by
other qlogic drivers, with clashes, ex: ql_sem_spinlock) or nothing (with
clashes, ex: struct ob_mac_iocb_req). Rename everything to use the "qlge_"
prefix
Function ql_soft_reset_mpi_risc renamed to
qlge_soft_reset_mpi_risc 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, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/qlge/qlge.h b/drivers/staging/qlge/qlge.h
index 6ec7e3ce3863..e9f1363c5bf2 100644
--- a/drivers/staging/qlge/qlge.h
+++ b/drivers/staging/qlge/qlge.h
@@ -2262,7 +2262,7 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data);
int ql_unpause_mpi_risc(struct ql_adapter *qdev);
int ql_pause_mpi_risc(struct ql_adapter *qdev);
int ql_hard_reset_mpi_risc(struct ql_adapter *qdev);
-int ql_soft_reset_mpi_risc(struct ql_adapter *qdev);
+int qlge_soft_reset_mpi_risc(struct ql_adapter *qdev);
int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf, u32 ram_addr,
int word_count);
int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump);
diff --git a/drivers/staging/qlge/qlge_dbg.c b/drivers/staging/qlge/qlge_dbg.c
index 019b7e6a1b7a..df5344e113ca 100644
--- a/drivers/staging/qlge/qlge_dbg.c
+++ b/drivers/staging/qlge/qlge_dbg.c
@@ -1312,7 +1312,7 @@ void ql_get_dump(struct ql_adapter *qdev, void *buff)
if (!test_bit(QL_FRC_COREDUMP, &qdev->flags)) {
if (!ql_core_dump(qdev, buff))
- ql_soft_reset_mpi_risc(qdev);
+ qlge_soft_reset_mpi_risc(qdev);
else
netif_err(qdev, drv, qdev->ndev, "coredump failed!\n");
} else {
diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c
index 9e422bbbb6ab..efe893935929 100644
--- a/drivers/staging/qlge/qlge_mpi.c
+++ b/drivers/staging/qlge/qlge_mpi.c
@@ -88,9 +88,10 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data)
return status;
}
-int ql_soft_reset_mpi_risc(struct ql_adapter *qdev)
+int qlge_soft_reset_mpi_risc(struct ql_adapter *qdev)
{
int status;
+
status = ql_write_mpi_reg(qdev, 0x00001010, 1);
return status;
}
@@ -1280,5 +1281,5 @@ void ql_mpi_reset_work(struct work_struct *work)
queue_delayed_work(qdev->workqueue,
&qdev->mpi_core_to_log, 5 * HZ);
}
- ql_soft_reset_mpi_risc(qdev);
+ qlge_soft_reset_mpi_risc(qdev);
}
--
2.17.1
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] Staging: qlge: Rename prefix of a function to qlge
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
0 siblings, 1 reply; 8+ messages in thread
From: Dan Carpenter @ 2019-10-25 10:19 UTC (permalink / raw)
To: Samuil Ivanov
Cc: devel, GR-Linux-NIC-Dev, manishc, gregkh, linux-kernel, netdev
On Fri, Oct 25, 2019 at 12:29:39AM +0300, Samuil Ivanov wrote:
> diff --git a/drivers/staging/qlge/qlge.h b/drivers/staging/qlge/qlge.h
> index 6ec7e3ce3863..e9f1363c5bf2 100644
> --- a/drivers/staging/qlge/qlge.h
> +++ b/drivers/staging/qlge/qlge.h
> @@ -2262,7 +2262,7 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data);
> int ql_unpause_mpi_risc(struct ql_adapter *qdev);
> int ql_pause_mpi_risc(struct ql_adapter *qdev);
> int ql_hard_reset_mpi_risc(struct ql_adapter *qdev);
> -int ql_soft_reset_mpi_risc(struct ql_adapter *qdev);
> +int qlge_soft_reset_mpi_risc(struct ql_adapter *qdev);
The patch series doesn't change all the functions so now it's hodge
podge.
> int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf, u32 ram_addr,
> int word_count);
> int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump);
> diff --git a/drivers/staging/qlge/qlge_dbg.c b/drivers/staging/qlge/qlge_dbg.c
> index 019b7e6a1b7a..df5344e113ca 100644
> --- a/drivers/staging/qlge/qlge_dbg.c
> +++ b/drivers/staging/qlge/qlge_dbg.c
> @@ -1312,7 +1312,7 @@ void ql_get_dump(struct ql_adapter *qdev, void *buff)
>
> if (!test_bit(QL_FRC_COREDUMP, &qdev->flags)) {
> if (!ql_core_dump(qdev, buff))
> - ql_soft_reset_mpi_risc(qdev);
> + qlge_soft_reset_mpi_risc(qdev);
> else
> netif_err(qdev, drv, qdev->ndev, "coredump failed!\n");
> } else {
> diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c
> index 9e422bbbb6ab..efe893935929 100644
> --- a/drivers/staging/qlge/qlge_mpi.c
> +++ b/drivers/staging/qlge/qlge_mpi.c
> @@ -88,9 +88,10 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data)
> return status;
> }
>
> -int ql_soft_reset_mpi_risc(struct ql_adapter *qdev)
> +int qlge_soft_reset_mpi_risc(struct ql_adapter *qdev)
> {
> int status;
> +
> status = ql_write_mpi_reg(qdev, 0x00001010, 1);
This white space change is unrelated.
> return status;
> }
regards,
dan carpenter
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] Staging: qlge: Rename prefix of a function to qlge
2019-10-25 10:19 ` Dan Carpenter
@ 2019-10-25 14:28 ` Samuil Ivanov
2019-10-25 14:55 ` Dan Carpenter
0 siblings, 1 reply; 8+ messages in thread
From: Samuil Ivanov @ 2019-10-25 14:28 UTC (permalink / raw)
To: dan.carpenter, gregkh
Cc: devel, netdev, GR-Linux-NIC-Dev, linux-kernel, manishc
On Fri, Oct 25, 2019 at 01:19:05PM +0300, Dan Carpenter wrote:
> On Fri, Oct 25, 2019 at 12:29:39AM +0300, Samuil Ivanov wrote:
> > diff --git a/drivers/staging/qlge/qlge.h b/drivers/staging/qlge/qlge.h
> > index 6ec7e3ce3863..e9f1363c5bf2 100644
> > --- a/drivers/staging/qlge/qlge.h
> > +++ b/drivers/staging/qlge/qlge.h
> > @@ -2262,7 +2262,7 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data);
> > int ql_unpause_mpi_risc(struct ql_adapter *qdev);
> > int ql_pause_mpi_risc(struct ql_adapter *qdev);
> > int ql_hard_reset_mpi_risc(struct ql_adapter *qdev);
> > -int ql_soft_reset_mpi_risc(struct ql_adapter *qdev);
> > +int qlge_soft_reset_mpi_risc(struct ql_adapter *qdev);
>
> The patch series doesn't change all the functions so now it's hodge
> podge.
>
> > int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf, u32 ram_addr,
> > int word_count);
> > int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump);
> > diff --git a/drivers/staging/qlge/qlge_dbg.c b/drivers/staging/qlge/qlge_dbg.c
> > index 019b7e6a1b7a..df5344e113ca 100644
> > --- a/drivers/staging/qlge/qlge_dbg.c
> > +++ b/drivers/staging/qlge/qlge_dbg.c
> > @@ -1312,7 +1312,7 @@ void ql_get_dump(struct ql_adapter *qdev, void *buff)
> >
> > if (!test_bit(QL_FRC_COREDUMP, &qdev->flags)) {
> > if (!ql_core_dump(qdev, buff))
> > - ql_soft_reset_mpi_risc(qdev);
> > + qlge_soft_reset_mpi_risc(qdev);
> > else
> > netif_err(qdev, drv, qdev->ndev, "coredump failed!\n");
> > } else {
> > diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c
> > index 9e422bbbb6ab..efe893935929 100644
> > --- a/drivers/staging/qlge/qlge_mpi.c
> > +++ b/drivers/staging/qlge/qlge_mpi.c
> > @@ -88,9 +88,10 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data)
> > return status;
> > }
> >
> > -int ql_soft_reset_mpi_risc(struct ql_adapter *qdev)
> > +int qlge_soft_reset_mpi_risc(struct ql_adapter *qdev)
> > {
> > int status;
> > +
> > status = ql_write_mpi_reg(qdev, 0x00001010, 1);
>
> This white space change is unrelated.
>
> > return status;
> > }
>
> regards,
> dan carpenter
>
Hello Dan and Greg,
Dan you are correct it is a bit of a hodge podge :)
I think that it is better to have a bigger patches that will rename
more functions, but I don't this it is good to have all the
functions renamed in one patch.
Just in the header file I counted around 55 function definitions,
and in the source files there are some more.
So that will make one huge patch.
And I am not sure if the maintainers will be OK with reviewing it.
So my sugestion is to have a bigger patches.
For example, one patch with 10 to 15 subpatches.
And one subpatch will rename one function and
update the occurrences in the driver.
This way with like 5 iterations all the functions will be renamed.
If you have a better solution please tell.
Grt,
Samuil
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] Staging: qlge: Rename prefix of a function to qlge
2019-10-25 14:28 ` Samuil Ivanov
@ 2019-10-25 14:55 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2019-10-25 14:55 UTC (permalink / raw)
To: Samuil Ivanov
Cc: devel, GR-Linux-NIC-Dev, manishc, gregkh, linux-kernel, netdev
On Fri, Oct 25, 2019 at 05:28:42PM +0300, Samuil Ivanov wrote:
> Dan you are correct it is a bit of a hodge podge :)
> I think that it is better to have a bigger patches that will rename
> more functions, but I don't this it is good to have all the
> functions renamed in one patch.
>
> Just in the header file I counted around 55 function definitions,
> and in the source files there are some more.
> So that will make one huge patch.
>
I don't really have a problem if you rename everything at once. Or if
you want to rename all of them in a 55 patch patchset that's also fine
with me...
regards,
dan carpenter
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] Staging: qlge: Rename prefix of a function to qlge
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-24 21:29 ` Samuil Ivanov
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
3 siblings, 0 replies; 8+ messages in thread
From: Samuil Ivanov @ 2019-10-24 21:29 UTC (permalink / raw)
To: gregkh, manishc, GR-Linux-NIC-Dev; +Cc: devel, netdev, linux-kernel
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
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/3] Staging: qlge: Rename prefix of a function to qlge
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-24 21:29 ` [PATCH 2/3] " Samuil Ivanov
@ 2019-10-24 21:29 ` Samuil Ivanov
2019-10-25 3:17 ` [PATCH 0/3] Staging: qlge: Rename of function prefix ql_ to qlge_ Greg KH
3 siblings, 0 replies; 8+ messages in thread
From: Samuil Ivanov @ 2019-10-24 21:29 UTC (permalink / raw)
To: gregkh, manishc, GR-Linux-NIC-Dev; +Cc: devel, netdev, linux-kernel
Function ql_mb_about_fw renamed to
qlge_mb_about_fw and it's clients updated.
Signed-off-by: Samuil Ivanov <samuil.ivanovbg@gmail.com>
---
drivers/staging/qlge/qlge.h | 2 +-
drivers/staging/qlge/qlge_main.c | 2 +-
drivers/staging/qlge/qlge_mpi.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/qlge/qlge.h b/drivers/staging/qlge/qlge.h
index d3f10c95c781..649f1fd10739 100644
--- a/drivers/staging/qlge/qlge.h
+++ b/drivers/staging/qlge/qlge.h
@@ -2266,7 +2266,7 @@ int qlge_soft_reset_mpi_risc(struct ql_adapter *qdev);
int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf, u32 ram_addr,
int word_count);
int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump);
-int ql_mb_about_fw(struct ql_adapter *qdev);
+int qlge_mb_about_fw(struct ql_adapter *qdev);
int ql_mb_wol_set_magic(struct ql_adapter *qdev, u32 enable_wol);
int ql_mb_wol_mode(struct ql_adapter *qdev, u32 wol);
int ql_mb_set_led_cfg(struct ql_adapter *qdev, u32 led_config);
diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 0c381d91faa6..b8f4f4e5e579 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -880,7 +880,7 @@ static int ql_8000_port_initialize(struct ql_adapter *qdev)
* Get MPI firmware version for driver banner
* and ethool info.
*/
- status = ql_mb_about_fw(qdev);
+ status = qlge_mb_about_fw(qdev);
if (status)
goto exit;
status = ql_mb_get_fw_state(qdev);
diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c
index ccffe0b256fa..092695719c58 100644
--- a/drivers/staging/qlge/qlge_mpi.c
+++ b/drivers/staging/qlge/qlge_mpi.c
@@ -612,7 +612,7 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp)
* driver banner and for ethtool info.
* Returns zero on success.
*/
-int ql_mb_about_fw(struct ql_adapter *qdev)
+int qlge_mb_about_fw(struct ql_adapter *qdev)
{
struct mbox_params mbc;
struct mbox_params *mbcp = &mbc;
--
2.17.1
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/3] Staging: qlge: Rename of function prefix ql_ to qlge_
2019-10-24 21:29 [PATCH 0/3] Staging: qlge: Rename of function prefix ql_ to qlge_ Samuil Ivanov
` (2 preceding siblings ...)
2019-10-24 21:29 ` [PATCH 3/3] " Samuil Ivanov
@ 2019-10-25 3:17 ` Greg KH
3 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2019-10-25 3:17 UTC (permalink / raw)
To: Samuil Ivanov; +Cc: devel, netdev, GR-Linux-NIC-Dev, linux-kernel, manishc
On Fri, Oct 25, 2019 at 12:29:38AM +0300, Samuil Ivanov wrote:
> In terms of namespace, the driver uses either qlge_, ql_ (used by
> other qlogic drivers, with clashes, ex: ql_sem_spinlock) or nothing (with
> clashes, ex: struct ob_mac_iocb_req). Rename everything to use the "qlge_"
> prefix.
>
> So I renamed three functions to the prefered namespace "qlge",
> and updated the occurrences in the driver.
>
> Samuil Ivanov (3):
> Staging: qlge: Rename prefix of a function to qlge
> Staging: qlge: Rename prefix of a function to qlge
> Staging: qlge: Rename prefix of a function to qlge
You sent 3 patches that do different things, yet have the same identical
subject line :(
Please fix up and resend the series.
thanks,
greg k-h
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 8+ messages in thread