2021-12-06 23:27:33

by David Mosberger-Tang

[permalink] [raw]
Subject: wilc1000: Fix minor typos in error messages

These two patches fix typos in error messages.

drivers/net/wireless/microchip/wilc1000/hif.c | 2 +-
drivers/net/wireless/microchip/wilc1000/netdev.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)



2021-12-06 23:27:36

by David Mosberger-Tang

[permalink] [raw]
Subject: [PATCH 1/2] wilc1000: Fix copy-and-paste typo in wilc_set_mac_address

The messages appears to have been copied from wilc_get_mac_address and
says "get" when it should say "set".

Signed-off-by: David Mosberger-Tang <[email protected]>
---
drivers/net/wireless/microchip/wilc1000/hif.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c
index e69b9c7f3d31..a019da0bfc3f 100644
--- a/drivers/net/wireless/microchip/wilc1000/hif.c
+++ b/drivers/net/wireless/microchip/wilc1000/hif.c
@@ -1312,7 +1312,7 @@ int wilc_set_mac_address(struct wilc_vif *vif, u8 *mac_addr)

result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1);
if (result)
- netdev_err(vif->ndev, "Failed to get mac address\n");
+ netdev_err(vif->ndev, "Failed to set mac address\n");

return result;
}
--
2.25.1


2021-12-06 23:27:47

by David Mosberger-Tang

[permalink] [raw]
Subject: [PATCH 2/2] wilc1000: Fix missing newline in error message

Add missing newline in pr_err() message.

Signed-off-by: David Mosberger-Tang <[email protected]>
---
drivers/net/wireless/microchip/wilc1000/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index 690572e01a2a..633cb3a43f6a 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -27,7 +27,7 @@ static irqreturn_t isr_uh_routine(int irq, void *user_data)
struct wilc *wilc = user_data;

if (wilc->close) {
- pr_err("Can't handle UH interrupt");
+ pr_err("Can't handle UH interrupt\n");
return IRQ_HANDLED;
}
return IRQ_WAKE_THREAD;
--
2.25.1


2021-12-07 01:35:54

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH 2/2] wilc1000: Fix missing newline in error message

On Mon, 2021-12-06 at 23:27 +0000, David Mosberger-Tang wrote:
> Add missing newline in pr_err() message.
[]
> diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
[]
> @@ -27,7 +27,7 @@ static irqreturn_t isr_uh_routine(int irq, void *user_data)
> struct wilc *wilc = user_data;
>
> if (wilc->close) {
> - pr_err("Can't handle UH interrupt");
> + pr_err("Can't handle UH interrupt\n");

Ideally this would use wiphy_<level>:

wiphy_err(wilc->wiphy, "Can't handle UH interrupt\n");



2021-12-07 22:58:58

by David Mosberger-Tang

[permalink] [raw]
Subject: Re: [PATCH 2/2] wilc1000: Fix missing newline in error message

On 12/6/21 6:33 PM, Joe Perches wrote:

> On Mon, 2021-12-06 at 23:27 +0000, David Mosberger-Tang wrote:
>> Add missing newline in pr_err() message.
> []
>> diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
> []
>> @@ -27,7 +27,7 @@ static irqreturn_t isr_uh_routine(int irq, void *user_data)
>> struct wilc *wilc = user_data;
>>
>> if (wilc->close) {
>> - pr_err("Can't handle UH interrupt");
>> + pr_err("Can't handle UH interrupt\n");
> Ideally this would use wiphy_<level>:
>
> wiphy_err(wilc->wiphy, "Can't handle UH interrupt\n");

Sure, but that's orthogonal to this bug fix.  I do have a "cleanups"
branch with various cleanups of this sort.  I'll look into fixing pr_*()
calls in the cleanups branch (there are several of them, unsurprisingly).


  --david



2021-12-08 00:29:26

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH 2/2] wilc1000: Fix missing newline in error message

On Tue, 2021-12-07 at 15:58 -0700, David Mosberger-Tang wrote:
> On 12/6/21 6:33 PM, Joe Perches wrote:
>
> > On Mon, 2021-12-06 at 23:27 +0000, David Mosberger-Tang wrote:
> > > Add missing newline in pr_err() message.
> > []
> > > diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
> > []
> > > @@ -27,7 +27,7 @@ static irqreturn_t isr_uh_routine(int irq, void *user_data)
> > > struct wilc *wilc = user_data;
> > >
> > > if (wilc->close) {
> > > - pr_err("Can't handle UH interrupt");
> > > + pr_err("Can't handle UH interrupt\n");
> > Ideally this would use wiphy_<level>:
> >
> > wiphy_err(wilc->wiphy, "Can't handle UH interrupt\n");
>
> Sure, but that's orthogonal to this bug fix.

Of course.

>?I do have a "cleanups"
> branch with various cleanups of this sort.? I'll look into fixing pr_*()
> calls in the cleanups branch (there are several of them, unsurprisingly).

netdev_<level> -> wiphy_<level> conversions too where feasible please.


2021-12-08 02:19:15

by David Mosberger-Tang

[permalink] [raw]
Subject: Re: [PATCH 2/2] wilc1000: Fix missing newline in error message

On Tue, 2021-12-07 at 16:23 -0800, Joe Perches wrote:
> On Tue, 2021-12-07 at 15:58 -0700, David Mosberger-Tang wrote:
> > On 12/6/21 6:33 PM, Joe Perches wrote:
> >
> > > On Mon, 2021-12-06 at 23:27 +0000, David Mosberger-Tang wrote:
> > > > Add missing newline in pr_err() message.
> > > []
> > > > diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
> > > []
> > > > @@ -27,7 +27,7 @@ static irqreturn_t isr_uh_routine(int irq, void *user_data)
> > > > struct wilc *wilc = user_data;
> > > >
> > > > if (wilc->close) {
> > > > - pr_err("Can't handle UH interrupt");
> > > > + pr_err("Can't handle UH interrupt\n");
> > > Ideally this would use wiphy_<level>:
> > >
> > > wiphy_err(wilc->wiphy, "Can't handle UH interrupt\n");
> >
> > Sure, but that's orthogonal to this bug fix.
>
> Of course.
>
> > I do have a "cleanups"
> > branch with various cleanups of this sort. I'll look into fixing pr_*()
> > calls in the cleanups branch (there are several of them, unsurprisingly).
>
> netdev_<level> -> wiphy_<level> conversions too where feasible please.

OK, I made a note for that, too, thanks.

--david



2021-12-14 18:43:24

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH 1/2] wilc1000: Fix copy-and-paste typo in wilc_set_mac_address

David Mosberger-Tang <[email protected]> wrote:

> The messages appears to have been copied from wilc_get_mac_address and
> says "get" when it should say "set".
>
> Signed-off-by: David Mosberger-Tang <[email protected]>

2 patches applied to wireless-drivers-next.git, thanks.

f92b9f967463 wilc1000: Fix copy-and-paste typo in wilc_set_mac_address
5ae660641db8 wilc1000: Fix missing newline in error message

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches