Message ID | 20250225163718.4169649-1-arnd@kernel.org (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | tpm: ftpm_tee: remove incorrect of_match_ptr annotation | expand |
On Tue, Feb 25, 2025 at 05:37:15PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Building with W=1 shows a warning about of_ftpm_tee_ids being unused when > CONFIG_OF is disabled: > > drivers/char/tpm/tpm_ftpm_tee.c:356:34: error: unused variable 'of_ftpm_tee_ids' [-Werror,-Wunused-const-variable] > > Drop the unnecessary of_match_ptr(). > > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > An earlier version had this combined with other changes, I made it > a separate patch now > --- > drivers/char/tpm/tpm_ftpm_tee.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Sumit Garg <sumit.garg@kernel.org> -Sumit > diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c > index 139556b21cc6..8d9209dfc384 100644 > --- a/drivers/char/tpm/tpm_ftpm_tee.c > +++ b/drivers/char/tpm/tpm_ftpm_tee.c > @@ -362,7 +362,7 @@ MODULE_DEVICE_TABLE(of, of_ftpm_tee_ids); > static struct platform_driver ftpm_tee_plat_driver = { > .driver = { > .name = "ftpm-tee", > - .of_match_table = of_match_ptr(of_ftpm_tee_ids), > + .of_match_table = of_ftpm_tee_ids, > }, > .shutdown = ftpm_plat_tee_shutdown, > .probe = ftpm_plat_tee_probe, > -- > 2.39.5 > >
On Tue, Feb 25, 2025 at 05:37:15PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Building with W=1 shows a warning about of_ftpm_tee_ids being unused when > CONFIG_OF is disabled: > > drivers/char/tpm/tpm_ftpm_tee.c:356:34: error: unused variable 'of_ftpm_tee_ids' [-Werror,-Wunused-const-variable] > > Drop the unnecessary of_match_ptr(). > > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> I've been on holiday (back at work on Monday). Moving to my TODO folder, thanks. > --- > An earlier version had this combined with other changes, I made it > a separate patch now > --- > drivers/char/tpm/tpm_ftpm_tee.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c > index 139556b21cc6..8d9209dfc384 100644 > --- a/drivers/char/tpm/tpm_ftpm_tee.c > +++ b/drivers/char/tpm/tpm_ftpm_tee.c > @@ -362,7 +362,7 @@ MODULE_DEVICE_TABLE(of, of_ftpm_tee_ids); > static struct platform_driver ftpm_tee_plat_driver = { > .driver = { > .name = "ftpm-tee", > - .of_match_table = of_match_ptr(of_ftpm_tee_ids), > + .of_match_table = of_ftpm_tee_ids, > }, > .shutdown = ftpm_plat_tee_shutdown, > .probe = ftpm_plat_tee_probe, > -- > 2.39.5 > BR, Jarkko
On Tue, Feb 25, 2025 at 05:37:15PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Building with W=1 shows a warning about of_ftpm_tee_ids being unused when > CONFIG_OF is disabled: > > drivers/char/tpm/tpm_ftpm_tee.c:356:34: error: unused variable 'of_ftpm_tee_ids' [-Werror,-Wunused-const-variable] > > Drop the unnecessary of_match_ptr(). > > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > An earlier version had this combined with other changes, I made it > a separate patch now > --- > drivers/char/tpm/tpm_ftpm_tee.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c > index 139556b21cc6..8d9209dfc384 100644 > --- a/drivers/char/tpm/tpm_ftpm_tee.c > +++ b/drivers/char/tpm/tpm_ftpm_tee.c > @@ -362,7 +362,7 @@ MODULE_DEVICE_TABLE(of, of_ftpm_tee_ids); > static struct platform_driver ftpm_tee_plat_driver = { > .driver = { > .name = "ftpm-tee", > - .of_match_table = of_match_ptr(of_ftpm_tee_ids), > + .of_match_table = of_ftpm_tee_ids, > }, > .shutdown = ftpm_plat_tee_shutdown, > .probe = ftpm_plat_tee_probe, > -- > 2.39.5 > It's now in my master (back from holidays) BR, Jarkko
diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c index 139556b21cc6..8d9209dfc384 100644 --- a/drivers/char/tpm/tpm_ftpm_tee.c +++ b/drivers/char/tpm/tpm_ftpm_tee.c @@ -362,7 +362,7 @@ MODULE_DEVICE_TABLE(of, of_ftpm_tee_ids); static struct platform_driver ftpm_tee_plat_driver = { .driver = { .name = "ftpm-tee", - .of_match_table = of_match_ptr(of_ftpm_tee_ids), + .of_match_table = of_ftpm_tee_ids, }, .shutdown = ftpm_plat_tee_shutdown, .probe = ftpm_plat_tee_probe,