fbdev: omap2: fix warnings in dss core

Message ID 20190213084721.29624-1-anders.roxell@linaro.org
State New
Headers show
Series
  • fbdev: omap2: fix warnings in dss core
Related show

Commit Message

Anders Roxell Feb. 13, 2019, 8:47 a.m.
Commit 60d2fa0dad06 ("fbdev: omap2: no need to check return value of
debugfs_create functions") changed the declaration of the return value
of function dss_debugfs_create_file() and the following two warnings
appeared:

drivers/video/fbdev/omap2/omapfb/dss/core.c: In function ‘dss_debugfs_create_file’:
drivers/video/fbdev/omap2/omapfb/dss/core.c:139:9: warning: ‘return’ with a value,
 in function returning void
  return 0;
         ^
drivers/video/fbdev/omap2/omapfb/dss/core.c: In function ‘omap_dss_probe’:
drivers/video/fbdev/omap2/omapfb/dss/core.c:172:6: warning: unused variable ‘r’
 [-Wunused-variable]
  int r;
      ^

Rework so function dss_debugfs_create_file() that is declared to return
void don't 'return 0' and remove the declaration of the unused variable
'r'.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 drivers/video/fbdev/omap2/omapfb/dss/core.c | 3 ---
 1 file changed, 3 deletions(-)

-- 
2.19.2

Comments

Bartlomiej Zolnierkiewicz March 1, 2019, 2:45 p.m. | #1
On 02/13/2019 09:47 AM, Anders Roxell wrote:
> Commit 60d2fa0dad06 ("fbdev: omap2: no need to check return value of

> debugfs_create functions") changed the declaration of the return value

> of function dss_debugfs_create_file() and the following two warnings

> appeared:

> 

> drivers/video/fbdev/omap2/omapfb/dss/core.c: In function ‘dss_debugfs_create_file’:

> drivers/video/fbdev/omap2/omapfb/dss/core.c:139:9: warning: ‘return’ with a value,

>  in function returning void

>   return 0;

>          ^

> drivers/video/fbdev/omap2/omapfb/dss/core.c: In function ‘omap_dss_probe’:

> drivers/video/fbdev/omap2/omapfb/dss/core.c:172:6: warning: unused variable ‘r’

>  [-Wunused-variable]

>   int r;

>       ^

> 

> Rework so function dss_debugfs_create_file() that is declared to return

> void don't 'return 0' and remove the declaration of the unused variable

> 'r'.

> 

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>


Patch queued for v5.1, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Patch

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/core.c b/drivers/video/fbdev/omap2/omapfb/dss/core.c
index 7e6a3eb266d0..b5956a1a30d4 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c
@@ -136,7 +136,6 @@  static inline void dss_uninitialize_debugfs(void)
 }
 void dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *))
 {
-	return 0;
 }
 #endif /* CONFIG_FB_OMAP2_DSS_DEBUGFS */
 
@@ -169,8 +168,6 @@  static struct notifier_block omap_dss_pm_notif_block = {
 
 static int __init omap_dss_probe(struct platform_device *pdev)
 {
-	int r;
-
 	core.pdev = pdev;
 
 	dss_features_init(omapdss_get_version());