Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1527570 > unrolled thread

[PATCH] misc: sram: remove useless #ifdef

Back to article view | Back to linux.kernel

Contents

  [PATCH] misc: sram: remove useless #ifdef Arnd Bergmann <arnd@arndb.de> - 2016-11-22 15:40 +0100
    Re: [PATCH] misc: sram: remove useless #ifdef Vladimir Zapolskiy <vz@mleia.com> - 2016-11-22 18:50 +0100
      Re: [PATCH] misc: sram: remove useless #ifdef Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-11-22 19:10 +0100

#1527570 — [PATCH] misc: sram: remove useless #ifdef

A recent patch added a new function that is now unused whenever
CONFIG_OF is disabled:

drivers/misc/sram.c:342:12: error: 'atmel_securam_wait' defined but not used [-Werror=unused-function]

There is actually no reason for the #ifdef, because the driver
currently cannot be used in a meaningful way without CONFIG_OF,
and there is no compile-time dependency.

Removing that #ifdef and the respective of_match_ptr() avoids the
warning and simplifies the driver slightly.

Fixes: 2ae2e28852f2 ("misc: sram: add Atmel securam support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/misc/sram.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
index b0d4dd9b0586..b33ab8ce47ab 100644
--- a/drivers/misc/sram.c
+++ b/drivers/misc/sram.c
@@ -353,13 +353,11 @@ static int atmel_securam_wait(void)
 					10000, 500000);
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id sram_dt_ids[] = {
 	{ .compatible = "mmio-sram" },
 	{ .compatible = "atmel,sama5d2-securam", .data = atmel_securam_wait },
 	{}
 };
-#endif
 
 static int sram_probe(struct platform_device *pdev)
 {
@@ -443,7 +441,7 @@ static int sram_remove(struct platform_device *pdev)
 static struct platform_driver sram_driver = {
 	.driver = {
 		.name = "sram",
-		.of_match_table = of_match_ptr(sram_dt_ids),
+		.of_match_table = sram_dt_ids,
 	},
 	.probe = sram_probe,
 	.remove = sram_remove,
-- 
2.9.0

[toc] | [next] | [standalone]

#1527779

Hi Arnd,

On 11/22/2016 04:30 PM, Arnd Bergmann wrote:
> A recent patch added a new function that is now unused whenever
> CONFIG_OF is disabled:
>
> drivers/misc/sram.c:342:12: error: 'atmel_securam_wait' defined but not used [-Werror=unused-function]
>
> There is actually no reason for the #ifdef, because the driver
> currently cannot be used in a meaningful way without CONFIG_OF,
> and there is no compile-time dependency.
>
> Removing that #ifdef and the respective of_match_ptr() avoids the
> warning and simplifies the driver slightly.
>
> Fixes: 2ae2e28852f2 ("misc: sram: add Atmel securam support")

I can not find the referenced commit on Torvald's branch,
won't it be rebased and get a changed commit hash after merge?

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---

The change itself is good, thank you for the fix.

Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>

--
Best wishes,
Vladimir

[toc] | [prev] | [next] | [standalone]

#1527801

Hi,

On 22/11/2016 at 19:47:52 +0200, Vladimir Zapolskiy wrote :
> Hi Arnd,
> 
> On 11/22/2016 04:30 PM, Arnd Bergmann wrote:
> > A recent patch added a new function that is now unused whenever
> > CONFIG_OF is disabled:
> > 
> > drivers/misc/sram.c:342:12: error: 'atmel_securam_wait' defined but not used [-Werror=unused-function]
> > 
> > There is actually no reason for the #ifdef, because the driver
> > currently cannot be used in a meaningful way without CONFIG_OF,
> > and there is no compile-time dependency.
> > 
> > Removing that #ifdef and the respective of_match_ptr() avoids the
> > warning and simplifies the driver slightly.
> > 
> > Fixes: 2ae2e28852f2 ("misc: sram: add Atmel securam support")
> 
> I can not find the referenced commit on Torvald's branch,
> won't it be rebased and get a changed commit hash after merge?
> 

No, it won't be rebased, the merge will keep the commit ID.


-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web