Home Home > GIT Browse > SLE11-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2019-03-22 14:31:43 +0100
committerMichal Hocko <mhocko@suse.com>2019-03-22 14:31:43 +0100
commit75622721c79b793061ea573c9811b41612e2dd78 (patch)
treeefcd48b17a86ef3f7b95c1e0e9a2bb2665f1d011
parent28e5dbdd9926953b93db60c4a9172a9e1dfc56a7 (diff)
parent401879d06d3d22bb19b2c0958eee17859abbdd81 (diff)
Merge remote-tracking branch 'origin/users/tzimmermann/SLE11-SP4/for-next' into users/mhocko/SLE11-SP4/for-nextSLE11-SP4
-rw-r--r--patches.fixes/0001-fbdev-chipsfb-remove-set-but-not-used-variable-size.patch45
-rw-r--r--series.conf1
2 files changed, 46 insertions, 0 deletions
diff --git a/patches.fixes/0001-fbdev-chipsfb-remove-set-but-not-used-variable-size.patch b/patches.fixes/0001-fbdev-chipsfb-remove-set-but-not-used-variable-size.patch
new file mode 100644
index 0000000000..c6695295b5
--- /dev/null
+++ b/patches.fixes/0001-fbdev-chipsfb-remove-set-but-not-used-variable-size.patch
@@ -0,0 +1,45 @@
+From 8e71fa5e4d86bedfd26df85381d65d6b4c860020 Mon Sep 17 00:00:00 2001
+From: YueHaibing <yuehaibing@huawei.com>
+Date: Fri, 8 Feb 2019 19:24:45 +0100
+Subject: fbdev: chipsfb: remove set but not used variable 'size'
+Git-commit: 8e71fa5e4d86bedfd26df85381d65d6b4c860020
+Patch-mainline: v5.1-rc1
+References: bsc#1106886
+
+Fixes gcc '-Wunused-but-set-variable' warning:
+
+drivers/video/chipsfb.c: In function 'chipsfb_pci_init':
+drivers/video/chipsfb.c:352:22: warning:
+ variable 'size' set but not used [-Wunused-but-set-variable]
+
+Fixes: 8c8709334cec ("[PATCH] ppc32: Remove CONFIG_PMAC_PBOOK").
+Signed-off-by: YueHaibing <yuehaibing@huawei.com>
+Acked-by: Michael Ellerman <mpe@ellerman.id.au>
+Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
+Cc: Christophe Leroy <christophe.leroy@c-s.fr>
+[b.zolnierkie: minor commit summary and description fixups]
+Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/video/chipsfb.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/video/chipsfb.c
++++ b/drivers/video/chipsfb.c
+@@ -351,7 +351,7 @@ static int __devinit
+ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
+ {
+ struct fb_info *p;
+- unsigned long addr, size;
++ unsigned long addr;
+ unsigned short cmd;
+ int rc = -ENODEV;
+
+@@ -363,7 +363,6 @@ chipsfb_pci_init(struct pci_dev *dp, con
+ if ((dp->resource[0].flags & IORESOURCE_MEM) == 0)
+ goto err_disable;
+ addr = pci_resource_start(dp, 0);
+- size = pci_resource_len(dp, 0);
+ if (addr == 0)
+ goto err_disable;
+
diff --git a/series.conf b/series.conf
index 3a089276bf..9355eb5d5a 100644
--- a/series.conf
+++ b/series.conf
@@ -12654,6 +12654,7 @@
patches.drm/0001-drm-fb-helper-Ignore-the-value-of-fb_var_screeninfo..patch
patches.drm/0001-omap2fb-Fix-stack-memory-disclosure.patch
patches.drm/0001-drm-Fix-error-handling-in-drm_legacy_addctx.patch
+ patches.fixes/0001-fbdev-chipsfb-remove-set-but-not-used-variable-size.patch
# boo1112963
patches.drm/0001-drm-ast-Remove-existing-framebuffers-before-loading-.patch