diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2019-03-01 09:45:09 -0500 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-03-01 09:45:09 -0500 |
| commit | 4c83c2f75a8f4737a8fb177bb7f2ffe464f567ca (patch) | |
| tree | e3d51b1170b4b530db25f374ff2eb8e2997ef0dc | |
| parent | f40298444e8ca13789dc002ffb269c343aadfb87 (diff) | |
fbdev: omap2: fix warnings in dss core
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>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/core.c | 3 |
1 files changed, 0 insertions, 3 deletions
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) | |||
| 136 | } | 136 | } |
| 137 | void dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *)) | 137 | void dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *)) |
| 138 | { | 138 | { |
| 139 | return 0; | ||
| 140 | } | 139 | } |
| 141 | #endif /* CONFIG_FB_OMAP2_DSS_DEBUGFS */ | 140 | #endif /* CONFIG_FB_OMAP2_DSS_DEBUGFS */ |
| 142 | 141 | ||
| @@ -169,8 +168,6 @@ static struct notifier_block omap_dss_pm_notif_block = { | |||
| 169 | 168 | ||
| 170 | static int __init omap_dss_probe(struct platform_device *pdev) | 169 | static int __init omap_dss_probe(struct platform_device *pdev) |
| 171 | { | 170 | { |
| 172 | int r; | ||
| 173 | |||
| 174 | core.pdev = pdev; | 171 | core.pdev = pdev; |
| 175 | 172 | ||
| 176 | dss_features_init(omapdss_get_version()); | 173 | dss_features_init(omapdss_get_version()); |
