diff mbox series

[v1,1/1] mrf29j40: Drop unneeded of_match_ptr()

Message ID 20210531132226.47081-1-andriy.shevchenko@linux.intel.com
State New
Headers show
Series [v1,1/1] mrf29j40: Drop unneeded of_match_ptr() | expand

Commit Message

Andy Shevchenko May 31, 2021, 1:22 p.m. UTC
Driver can be used in different environments and moreover, when compiled
with !OF, the compiler may issue a warning due to unused mrf24j40_of_match
variable. Hence drop unneeded of_match_ptr() call.

While at it, update headers block to reflect above changes.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/net/ieee802154/mrf24j40.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stefan Schmidt June 3, 2021, 8:34 a.m. UTC | #1
Hello.

On 31.05.21 15:22, Andy Shevchenko wrote:
> Driver can be used in different environments and moreover, when compiled

> with !OF, the compiler may issue a warning due to unused mrf24j40_of_match

> variable. Hence drop unneeded of_match_ptr() call.

> 

> While at it, update headers block to reflect above changes.

> 

> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> ---

>   drivers/net/ieee802154/mrf24j40.c | 4 ++--

>   1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c

> index b9be530b285f..ff83e00b77af 100644

> --- a/drivers/net/ieee802154/mrf24j40.c

> +++ b/drivers/net/ieee802154/mrf24j40.c

> @@ -8,8 +8,8 @@

>   

>   #include <linux/spi/spi.h>

>   #include <linux/interrupt.h>

> +#include <linux/mod_devicetable.h>

>   #include <linux/module.h>

> -#include <linux/of.h>

>   #include <linux/regmap.h>

>   #include <linux/ieee802154.h>

>   #include <linux/irq.h>

> @@ -1388,7 +1388,7 @@ MODULE_DEVICE_TABLE(spi, mrf24j40_ids);

>   

>   static struct spi_driver mrf24j40_driver = {

>   	.driver = {

> -		.of_match_table = of_match_ptr(mrf24j40_of_match),

> +		.of_match_table = mrf24j40_of_match,

>   		.name = "mrf24j40",

>   	},

>   	.id_table = mrf24j40_ids,

> 


I took the freedom to fix the typo in the subject line and add a better 
prefix:

net: ieee802154: mrf24j40: Drop unneeded of_match_ptr()

This patch has been applied to the wpan tree and will be
part of the next pull request to net. Thanks!

regards
Stefan Schmidt
Andy Shevchenko June 3, 2021, 9:19 a.m. UTC | #2
On Thu, Jun 3, 2021 at 11:35 AM Stefan Schmidt
<stefan@datenfreihafen.org> wrote:
> On 31.05.21 15:22, Andy Shevchenko wrote:

> > Driver can be used in different environments and moreover, when compiled

> > with !OF, the compiler may issue a warning due to unused mrf24j40_of_match

> > variable. Hence drop unneeded of_match_ptr() call.

> >

> > While at it, update headers block to reflect above changes.


...

> I took the freedom to fix the typo in the subject line and add a better

> prefix:

>

> net: ieee802154: mrf24j40: Drop unneeded of_match_ptr()


Right, thanks!

> This patch has been applied to the wpan tree and will be

> part of the next pull request to net. Thanks!


Btw, which tree are you using for wpan development? I see one with 6
weeks old commits, is that the correct one?

-- 
With Best Regards,
Andy Shevchenko
Stefan Schmidt June 3, 2021, 9:23 a.m. UTC | #3
Hello.

On 03.06.21 11:19, Andy Shevchenko wrote:
> On Thu, Jun 3, 2021 at 11:35 AM Stefan Schmidt

> <stefan@datenfreihafen.org> wrote:

>> On 31.05.21 15:22, Andy Shevchenko wrote:

>>> Driver can be used in different environments and moreover, when compiled

>>> with !OF, the compiler may issue a warning due to unused mrf24j40_of_match

>>> variable. Hence drop unneeded of_match_ptr() call.

>>>

>>> While at it, update headers block to reflect above changes.

> 

> ...

> 

>> I took the freedom to fix the typo in the subject line and add a better

>> prefix:

>>

>> net: ieee802154: mrf24j40: Drop unneeded of_match_ptr()

> 

> Right, thanks!

> 

>> This patch has been applied to the wpan tree and will be

>> part of the next pull request to net. Thanks!

> 

> Btw, which tree are you using for wpan development? I see one with 6

> weeks old commits, is that the correct one?


I assume you mean this one:
https://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git/

Its the correct one. I was a bit busy lately, but luckily ieee802154 
patches again net apply fine most of the time as well.

I collected the piled up patches right now and will send a pull request 
after some testing later today. Once that is merged I will update my 
tree as well.

regards
Stefan Schmidt
Andy Shevchenko June 3, 2021, 9:25 a.m. UTC | #4
On Thu, Jun 3, 2021 at 12:23 PM Stefan Schmidt
<stefan@datenfreihafen.org> wrote:
> On 03.06.21 11:19, Andy Shevchenko wrote:

> > On Thu, Jun 3, 2021 at 11:35 AM Stefan Schmidt

> > <stefan@datenfreihafen.org> wrote:

> >> On 31.05.21 15:22, Andy Shevchenko wrote:

> >>> Driver can be used in different environments and moreover, when compiled

> >>> with !OF, the compiler may issue a warning due to unused mrf24j40_of_match

> >>> variable. Hence drop unneeded of_match_ptr() call.

> >>>

> >>> While at it, update headers block to reflect above changes.

> >

> > ...

> >

> >> I took the freedom to fix the typo in the subject line and add a better

> >> prefix:

> >>

> >> net: ieee802154: mrf24j40: Drop unneeded of_match_ptr()

> >

> > Right, thanks!

> >

> >> This patch has been applied to the wpan tree and will be

> >> part of the next pull request to net. Thanks!

> >

> > Btw, which tree are you using for wpan development? I see one with 6

> > weeks old commits, is that the correct one?

>

> I assume you mean this one:

> https://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git/


I think so.

> Its the correct one. I was a bit busy lately, but luckily ieee802154

> patches again net apply fine most of the time as well.

>

> I collected the piled up patches right now and will send a pull request

> after some testing later today. Once that is merged I will update my

> tree as well.


I see. Thanks for explaining your workflow.

-- 
With Best Regards,
Andy Shevchenko
diff mbox series

Patch

diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index b9be530b285f..ff83e00b77af 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -8,8 +8,8 @@ 
 
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of.h>
 #include <linux/regmap.h>
 #include <linux/ieee802154.h>
 #include <linux/irq.h>
@@ -1388,7 +1388,7 @@  MODULE_DEVICE_TABLE(spi, mrf24j40_ids);
 
 static struct spi_driver mrf24j40_driver = {
 	.driver = {
-		.of_match_table = of_match_ptr(mrf24j40_of_match),
+		.of_match_table = mrf24j40_of_match,
 		.name = "mrf24j40",
 	},
 	.id_table = mrf24j40_ids,