Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-01-10 15:38:10 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2019-01-11 13:39:39 +0100
commit77d6a04006d8ea4fb1da6b2890dc73d628d023dc (patch)
tree7b83715338d5719142447320d8908462d20206d8
parent24231ac081b74036647fa24c1202d44198a555b1 (diff)
fbdev: omapfb: remove unused variable (bsc#1113956)
-rw-r--r--patches.drm/0001-fbdev-omapfb-remove-unused-variable.patch40
-rw-r--r--series.conf1
2 files changed, 41 insertions, 0 deletions
diff --git a/patches.drm/0001-fbdev-omapfb-remove-unused-variable.patch b/patches.drm/0001-fbdev-omapfb-remove-unused-variable.patch
new file mode 100644
index 0000000000..fe360eaa6e
--- /dev/null
+++ b/patches.drm/0001-fbdev-omapfb-remove-unused-variable.patch
@@ -0,0 +1,40 @@
+From 7b4dfbe7880cf2092db3c94c6a34ae6ffa8aa344 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 31 Jul 2017 18:45:41 +0200
+Subject: fbdev: omapfb: remove unused variable
+Git-commit: 7b4dfbe7880cf2092db3c94c6a34ae6ffa8aa344
+Patch-mainline: v4.13-rc5
+References: bsc#1113956
+
+Removing the default display name left a harmless warning:
+
+fbdev/omap2/omapfb/dss/core.c: In function 'omap_dss_probe':
+fbdev/omap2/omapfb/dss/core.c:196:30: error: unused variable 'pdata' [-Werror=unused-variable]
+
+This removes the now-unused variable as well.
+
+Fixes: 278cba7eaf54 ("drm: omapdrm: Remove unused default display name support")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
+Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/video/fbdev/omap2/omapfb/dss/core.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/video/fbdev/omap2/omapfb/dss/core.c b/drivers/video/fbdev/omap2/omapfb/dss/core.c
+index eecf695c16f4..09e5bb013d28 100644
+--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c
++++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c
+@@ -193,7 +193,6 @@ static struct notifier_block omap_dss_pm_notif_block = {
+
+ static int __init omap_dss_probe(struct platform_device *pdev)
+ {
+- struct omap_dss_board_info *pdata = pdev->dev.platform_data;
+ int r;
+
+ core.pdev = pdev;
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 1361fb6ddb..41680dec80 100644
--- a/series.conf
+++ b/series.conf
@@ -5929,6 +5929,7 @@
patches.drm/0733-drm-make-drm_stm-default-n
patches.drm/drm-nouveau-disp-nv04-avoid-creation-of-output-paths
patches.arch/powerpc-cpuidle-0010-Disable-LOSE_FULL_CONTEXT-states-when-stop-api-fails.patch
+ patches.drm/0001-fbdev-omapfb-remove-unused-variable.patch
patches.drivers/mmc-block-fix-lockdep-splat-when-removing-mmc_block-module.patch
patches.suse/0127-bio-integrity-Fix-regression-if-profile-verify_fn-is.patch
patches.suse/0128-bio-integrity-only-verify-integrity-on-the-lowest-st.patch