Drop arch-powerpc-remove-linux-fb.h-from-backlight-code.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch b/queue-4.19/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
deleted file mode 100644 (file)
index 9a3d87f..0000000
--- a/queue-4.19/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 489560c90793e6ae07506e8875b75bd0a8c6fa6f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Mar 2024 13:28:20 +0100
-Subject: arch/powerpc: Remove <linux/fb.h> from backlight code
-
-From: Thomas Zimmermann <tzimmermann@suse.de>
-
-[ Upstream commit 838f865802b9f26135ea7df4e30f89ac2f50c23e ]
-
-Replace <linux/fb.h> with a forward declaration in <asm/backlight.h> to
-resolve an unnecessary dependency. Remove pmac_backlight_curve_lookup()
-and struct fb_info from source and header files. The function and the
-framebuffer struct are unused. No functional changes.
-
-v3:
-       * Add Fixes tag (Christophe)
-       * fix typos in commit message (Jani)
-
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Fixes: d565dd3b0824 ("[PATCH] powerpc: More via-pmu backlight fixes")
-Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au> # (powerpc)
-Link: https://patchwork.freedesktop.org/patch/msgid/20240306122935.10626-4-tzimmermann@suse.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/backlight.h        |  5 ++--
- arch/powerpc/platforms/powermac/backlight.c | 26 ---------------------
- 2 files changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/backlight.h b/arch/powerpc/include/asm/backlight.h
-index 1b5eab62ed047..061a910d74929 100644
---- a/arch/powerpc/include/asm/backlight.h
-+++ b/arch/powerpc/include/asm/backlight.h
-@@ -10,15 +10,14 @@
- #define __ASM_POWERPC_BACKLIGHT_H
- #ifdef __KERNEL__
- 
--#include <linux/fb.h>
- #include <linux/mutex.h>
- 
-+struct backlight_device;
-+
- /* For locking instructions, see the implementation file */
- extern struct backlight_device *pmac_backlight;
- extern struct mutex pmac_backlight_mutex;
- 
--extern int pmac_backlight_curve_lookup(struct fb_info *info, int value);
--
- extern int pmac_has_backlight_type(const char *type);
- 
- extern void pmac_backlight_key(int direction);
-diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
-index 6b5dcccae1d30..8fae9a7d3d47c 100644
---- a/arch/powerpc/platforms/powermac/backlight.c
-+++ b/arch/powerpc/platforms/powermac/backlight.c
-@@ -8,7 +8,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/fb.h>
- #include <linux/backlight.h>
- #include <linux/adb.h>
- #include <linux/pmu.h>
-@@ -72,31 +71,6 @@ int pmac_has_backlight_type(const char *type)
-       return 0;
- }
- 
--int pmac_backlight_curve_lookup(struct fb_info *info, int value)
--{
--      int level = (FB_BACKLIGHT_LEVELS - 1);
--
--      if (info && info->bl_dev) {
--              int i, max = 0;
--
--              /* Look for biggest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)
--                      max = max((int)info->bl_curve[i], max);
--
--              /* Look for nearest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {
--                      int diff = abs(info->bl_curve[i] - value);
--                      if (diff < max) {
--                              max = diff;
--                              level = i;
--                      }
--              }
--
--      }
--
--      return level;
--}
--
- static void pmac_backlight_key_worker(struct work_struct *work)
- {
-       if (atomic_read(&kernel_backlight_disabled))
--- 
-2.43.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 229fba9bb6ca767b24cea643c2ae945eb25b70b8..e8d6f616e575fafac6b5ea0e11c94328c8ac7d83 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -123,7 +123,6 @@ backlight-lm3630a-don-t-set-bl-props.brightness-in-g.patch
 backlight-da9052-fully-initialize-backlight_properti.patch
 backlight-lm3639-fully-initialize-backlight_properti.patch
 backlight-lp8788-fully-initialize-backlight_properti.patch
-arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
 sparc32-fix-section-mismatch-in-leon_pci_grpci.patch
 alsa-usb-audio-stop-parsing-channels-bits-when-all-c.patch
 scsi-csiostor-avoid-function-pointer-casts.patch

diff --git a/queue-5.10/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch b/queue-5.10/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
deleted file mode 100644 (file)
index 523cbce..0000000
--- a/queue-5.10/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 33f2ce1065b52243bda6f434c6ae14f1dad18067 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Mar 2024 13:28:20 +0100
-Subject: arch/powerpc: Remove <linux/fb.h> from backlight code
-
-From: Thomas Zimmermann <tzimmermann@suse.de>
-
-[ Upstream commit 838f865802b9f26135ea7df4e30f89ac2f50c23e ]
-
-Replace <linux/fb.h> with a forward declaration in <asm/backlight.h> to
-resolve an unnecessary dependency. Remove pmac_backlight_curve_lookup()
-and struct fb_info from source and header files. The function and the
-framebuffer struct are unused. No functional changes.
-
-v3:
-       * Add Fixes tag (Christophe)
-       * fix typos in commit message (Jani)
-
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Fixes: d565dd3b0824 ("[PATCH] powerpc: More via-pmu backlight fixes")
-Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au> # (powerpc)
-Link: https://patchwork.freedesktop.org/patch/msgid/20240306122935.10626-4-tzimmermann@suse.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/backlight.h        |  5 ++--
- arch/powerpc/platforms/powermac/backlight.c | 26 ---------------------
- 2 files changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/backlight.h b/arch/powerpc/include/asm/backlight.h
-index 1b5eab62ed047..061a910d74929 100644
---- a/arch/powerpc/include/asm/backlight.h
-+++ b/arch/powerpc/include/asm/backlight.h
-@@ -10,15 +10,14 @@
- #define __ASM_POWERPC_BACKLIGHT_H
- #ifdef __KERNEL__
- 
--#include <linux/fb.h>
- #include <linux/mutex.h>
- 
-+struct backlight_device;
-+
- /* For locking instructions, see the implementation file */
- extern struct backlight_device *pmac_backlight;
- extern struct mutex pmac_backlight_mutex;
- 
--extern int pmac_backlight_curve_lookup(struct fb_info *info, int value);
--
- extern int pmac_has_backlight_type(const char *type);
- 
- extern void pmac_backlight_key(int direction);
-diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
-index 32224cb489d75..eab339d2059d5 100644
---- a/arch/powerpc/platforms/powermac/backlight.c
-+++ b/arch/powerpc/platforms/powermac/backlight.c
-@@ -9,7 +9,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/fb.h>
- #include <linux/backlight.h>
- #include <linux/adb.h>
- #include <linux/pmu.h>
-@@ -73,31 +72,6 @@ int pmac_has_backlight_type(const char *type)
-       return 0;
- }
- 
--int pmac_backlight_curve_lookup(struct fb_info *info, int value)
--{
--      int level = (FB_BACKLIGHT_LEVELS - 1);
--
--      if (info && info->bl_dev) {
--              int i, max = 0;
--
--              /* Look for biggest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)
--                      max = max((int)info->bl_curve[i], max);
--
--              /* Look for nearest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {
--                      int diff = abs(info->bl_curve[i] - value);
--                      if (diff < max) {
--                              max = diff;
--                              level = i;
--                      }
--              }
--
--      }
--
--      return level;
--}
--
- static void pmac_backlight_key_worker(struct work_struct *work)
- {
-       if (atomic_read(&kernel_backlight_disabled))
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 0a035cc2bc54e9145c381ce60536e6a9da409c53..d576e5f62602dcc25347d49d5626eb8960f29c6b 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -185,7 +185,6 @@ backlight-lm3630a-don-t-set-bl-props.brightness-in-g.patch
 backlight-da9052-fully-initialize-backlight_properti.patch
 backlight-lm3639-fully-initialize-backlight_properti.patch
 backlight-lp8788-fully-initialize-backlight_properti.patch
-arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
 sparc32-fix-section-mismatch-in-leon_pci_grpci.patch
 clk-fix-clk_core_get-null-dereference.patch
 alsa-hda-realtek-fix-alc285-issues-on-hp-envy-x360-l.patch

diff --git a/queue-5.15/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch b/queue-5.15/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
deleted file mode 100644 (file)
index f0807a0..0000000
--- a/queue-5.15/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 76ee4e092c22f0635b212796bbbc97682f97ce25 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Mar 2024 13:28:20 +0100
-Subject: arch/powerpc: Remove <linux/fb.h> from backlight code
-
-From: Thomas Zimmermann <tzimmermann@suse.de>
-
-[ Upstream commit 838f865802b9f26135ea7df4e30f89ac2f50c23e ]
-
-Replace <linux/fb.h> with a forward declaration in <asm/backlight.h> to
-resolve an unnecessary dependency. Remove pmac_backlight_curve_lookup()
-and struct fb_info from source and header files. The function and the
-framebuffer struct are unused. No functional changes.
-
-v3:
-       * Add Fixes tag (Christophe)
-       * fix typos in commit message (Jani)
-
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Fixes: d565dd3b0824 ("[PATCH] powerpc: More via-pmu backlight fixes")
-Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au> # (powerpc)
-Link: https://patchwork.freedesktop.org/patch/msgid/20240306122935.10626-4-tzimmermann@suse.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/backlight.h        |  5 ++--
- arch/powerpc/platforms/powermac/backlight.c | 26 ---------------------
- 2 files changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/backlight.h b/arch/powerpc/include/asm/backlight.h
-index 1b5eab62ed047..061a910d74929 100644
---- a/arch/powerpc/include/asm/backlight.h
-+++ b/arch/powerpc/include/asm/backlight.h
-@@ -10,15 +10,14 @@
- #define __ASM_POWERPC_BACKLIGHT_H
- #ifdef __KERNEL__
- 
--#include <linux/fb.h>
- #include <linux/mutex.h>
- 
-+struct backlight_device;
-+
- /* For locking instructions, see the implementation file */
- extern struct backlight_device *pmac_backlight;
- extern struct mutex pmac_backlight_mutex;
- 
--extern int pmac_backlight_curve_lookup(struct fb_info *info, int value);
--
- extern int pmac_has_backlight_type(const char *type);
- 
- extern void pmac_backlight_key(int direction);
-diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
-index 32224cb489d75..eab339d2059d5 100644
---- a/arch/powerpc/platforms/powermac/backlight.c
-+++ b/arch/powerpc/platforms/powermac/backlight.c
-@@ -9,7 +9,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/fb.h>
- #include <linux/backlight.h>
- #include <linux/adb.h>
- #include <linux/pmu.h>
-@@ -73,31 +72,6 @@ int pmac_has_backlight_type(const char *type)
-       return 0;
- }
- 
--int pmac_backlight_curve_lookup(struct fb_info *info, int value)
--{
--      int level = (FB_BACKLIGHT_LEVELS - 1);
--
--      if (info && info->bl_dev) {
--              int i, max = 0;
--
--              /* Look for biggest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)
--                      max = max((int)info->bl_curve[i], max);
--
--              /* Look for nearest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {
--                      int diff = abs(info->bl_curve[i] - value);
--                      if (diff < max) {
--                              max = diff;
--                              level = i;
--                      }
--              }
--
--      }
--
--      return level;
--}
--
- static void pmac_backlight_key_worker(struct work_struct *work)
- {
-       if (atomic_read(&kernel_backlight_disabled))
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index bfb10d12acd241ac13cc90ff5b2e0361f36699e0..2e3336197a013e475ef74bf05258639de5b0f87a 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -244,7 +244,6 @@ backlight-lm3630a-don-t-set-bl-props.brightness-in-g.patch
 backlight-da9052-fully-initialize-backlight_properti.patch
 backlight-lm3639-fully-initialize-backlight_properti.patch
 backlight-lp8788-fully-initialize-backlight_properti.patch
-arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
 sparc32-fix-section-mismatch-in-leon_pci_grpci.patch
 clk-fix-clk_core_get-null-dereference.patch
 clk-zynq-prevent-null-pointer-dereference-caused-by-.patch

diff --git a/queue-5.4/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch b/queue-5.4/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
deleted file mode 100644 (file)
index 6989eb1..0000000
--- a/queue-5.4/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 386a937d0b3d43b9e3e3dcd86357e7e103ecc41b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Mar 2024 13:28:20 +0100
-Subject: arch/powerpc: Remove <linux/fb.h> from backlight code
-
-From: Thomas Zimmermann <tzimmermann@suse.de>
-
-[ Upstream commit 838f865802b9f26135ea7df4e30f89ac2f50c23e ]
-
-Replace <linux/fb.h> with a forward declaration in <asm/backlight.h> to
-resolve an unnecessary dependency. Remove pmac_backlight_curve_lookup()
-and struct fb_info from source and header files. The function and the
-framebuffer struct are unused. No functional changes.
-
-v3:
-       * Add Fixes tag (Christophe)
-       * fix typos in commit message (Jani)
-
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Fixes: d565dd3b0824 ("[PATCH] powerpc: More via-pmu backlight fixes")
-Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au> # (powerpc)
-Link: https://patchwork.freedesktop.org/patch/msgid/20240306122935.10626-4-tzimmermann@suse.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/backlight.h        |  5 ++--
- arch/powerpc/platforms/powermac/backlight.c | 26 ---------------------
- 2 files changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/backlight.h b/arch/powerpc/include/asm/backlight.h
-index 1b5eab62ed047..061a910d74929 100644
---- a/arch/powerpc/include/asm/backlight.h
-+++ b/arch/powerpc/include/asm/backlight.h
-@@ -10,15 +10,14 @@
- #define __ASM_POWERPC_BACKLIGHT_H
- #ifdef __KERNEL__
- 
--#include <linux/fb.h>
- #include <linux/mutex.h>
- 
-+struct backlight_device;
-+
- /* For locking instructions, see the implementation file */
- extern struct backlight_device *pmac_backlight;
- extern struct mutex pmac_backlight_mutex;
- 
--extern int pmac_backlight_curve_lookup(struct fb_info *info, int value);
--
- extern int pmac_has_backlight_type(const char *type);
- 
- extern void pmac_backlight_key(int direction);
-diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
-index 32224cb489d75..eab339d2059d5 100644
---- a/arch/powerpc/platforms/powermac/backlight.c
-+++ b/arch/powerpc/platforms/powermac/backlight.c
-@@ -9,7 +9,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/fb.h>
- #include <linux/backlight.h>
- #include <linux/adb.h>
- #include <linux/pmu.h>
-@@ -73,31 +72,6 @@ int pmac_has_backlight_type(const char *type)
-       return 0;
- }
- 
--int pmac_backlight_curve_lookup(struct fb_info *info, int value)
--{
--      int level = (FB_BACKLIGHT_LEVELS - 1);
--
--      if (info && info->bl_dev) {
--              int i, max = 0;
--
--              /* Look for biggest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)
--                      max = max((int)info->bl_curve[i], max);
--
--              /* Look for nearest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {
--                      int diff = abs(info->bl_curve[i] - value);
--                      if (diff < max) {
--                              max = diff;
--                              level = i;
--                      }
--              }
--
--      }
--
--      return level;
--}
--
- static void pmac_backlight_key_worker(struct work_struct *work)
- {
-       if (atomic_read(&kernel_backlight_disabled))
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 9d6d6c099b97b9b365b9ac48a41923b6cdce8f07..ed10f763bc3d6a157e1be578f13e9f43d6c8974c 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -146,7 +146,6 @@ backlight-lm3630a-don-t-set-bl-props.brightness-in-g.patch
 backlight-da9052-fully-initialize-backlight_properti.patch
 backlight-lm3639-fully-initialize-backlight_properti.patch
 backlight-lp8788-fully-initialize-backlight_properti.patch
-arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
 sparc32-fix-section-mismatch-in-leon_pci_grpci.patch
 clk-fix-clk_core_get-null-dereference.patch
 alsa-usb-audio-stop-parsing-channels-bits-when-all-c.patch

diff --git a/queue-6.1/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch b/queue-6.1/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
deleted file mode 100644 (file)
index 6f8b59a..0000000
--- a/queue-6.1/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From b1a0d8828263b5c81d6f672a5995493eee7b5558 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Mar 2024 13:28:20 +0100
-Subject: arch/powerpc: Remove <linux/fb.h> from backlight code
-
-From: Thomas Zimmermann <tzimmermann@suse.de>
-
-[ Upstream commit 838f865802b9f26135ea7df4e30f89ac2f50c23e ]
-
-Replace <linux/fb.h> with a forward declaration in <asm/backlight.h> to
-resolve an unnecessary dependency. Remove pmac_backlight_curve_lookup()
-and struct fb_info from source and header files. The function and the
-framebuffer struct are unused. No functional changes.
-
-v3:
-       * Add Fixes tag (Christophe)
-       * fix typos in commit message (Jani)
-
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Fixes: d565dd3b0824 ("[PATCH] powerpc: More via-pmu backlight fixes")
-Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au> # (powerpc)
-Link: https://patchwork.freedesktop.org/patch/msgid/20240306122935.10626-4-tzimmermann@suse.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/backlight.h        |  5 ++--
- arch/powerpc/platforms/powermac/backlight.c | 26 ---------------------
- 2 files changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/backlight.h b/arch/powerpc/include/asm/backlight.h
-index 1b5eab62ed047..061a910d74929 100644
---- a/arch/powerpc/include/asm/backlight.h
-+++ b/arch/powerpc/include/asm/backlight.h
-@@ -10,15 +10,14 @@
- #define __ASM_POWERPC_BACKLIGHT_H
- #ifdef __KERNEL__
- 
--#include <linux/fb.h>
- #include <linux/mutex.h>
- 
-+struct backlight_device;
-+
- /* For locking instructions, see the implementation file */
- extern struct backlight_device *pmac_backlight;
- extern struct mutex pmac_backlight_mutex;
- 
--extern int pmac_backlight_curve_lookup(struct fb_info *info, int value);
--
- extern int pmac_has_backlight_type(const char *type);
- 
- extern void pmac_backlight_key(int direction);
-diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
-index aeb79a8b3e109..12bc01353bd3c 100644
---- a/arch/powerpc/platforms/powermac/backlight.c
-+++ b/arch/powerpc/platforms/powermac/backlight.c
-@@ -9,7 +9,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/fb.h>
- #include <linux/backlight.h>
- #include <linux/adb.h>
- #include <linux/pmu.h>
-@@ -72,31 +71,6 @@ int pmac_has_backlight_type(const char *type)
-       return 0;
- }
- 
--int pmac_backlight_curve_lookup(struct fb_info *info, int value)
--{
--      int level = (FB_BACKLIGHT_LEVELS - 1);
--
--      if (info && info->bl_dev) {
--              int i, max = 0;
--
--              /* Look for biggest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)
--                      max = max((int)info->bl_curve[i], max);
--
--              /* Look for nearest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {
--                      int diff = abs(info->bl_curve[i] - value);
--                      if (diff < max) {
--                              max = diff;
--                              level = i;
--                      }
--              }
--
--      }
--
--      return level;
--}
--
- static void pmac_backlight_key_worker(struct work_struct *work)
- {
-       if (atomic_read(&kernel_backlight_disabled))
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index cd018d8f7f3b84979ab49ba9e4072629e7fd7ce1..8b59078b64b79567f464fb75b4210d5754627f52 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -340,7 +340,6 @@ backlight-lm3630a-don-t-set-bl-props.brightness-in-g.patch
 backlight-da9052-fully-initialize-backlight_properti.patch
 backlight-lm3639-fully-initialize-backlight_properti.patch
 backlight-lp8788-fully-initialize-backlight_properti.patch
-arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
 sparc32-fix-section-mismatch-in-leon_pci_grpci.patch
 clk-fix-clk_core_get-null-dereference.patch
 clk-zynq-prevent-null-pointer-dereference-caused-by-.patch

diff --git a/queue-6.6/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch b/queue-6.6/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
deleted file mode 100644 (file)
index 51396c6..0000000
--- a/queue-6.6/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From ec6d968373bc3994f8e9c936671bce454d16f3d7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Mar 2024 13:28:20 +0100
-Subject: arch/powerpc: Remove <linux/fb.h> from backlight code
-
-From: Thomas Zimmermann <tzimmermann@suse.de>
-
-[ Upstream commit 838f865802b9f26135ea7df4e30f89ac2f50c23e ]
-
-Replace <linux/fb.h> with a forward declaration in <asm/backlight.h> to
-resolve an unnecessary dependency. Remove pmac_backlight_curve_lookup()
-and struct fb_info from source and header files. The function and the
-framebuffer struct are unused. No functional changes.
-
-v3:
-       * Add Fixes tag (Christophe)
-       * fix typos in commit message (Jani)
-
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Fixes: d565dd3b0824 ("[PATCH] powerpc: More via-pmu backlight fixes")
-Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au> # (powerpc)
-Link: https://patchwork.freedesktop.org/patch/msgid/20240306122935.10626-4-tzimmermann@suse.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/backlight.h        |  5 ++--
- arch/powerpc/platforms/powermac/backlight.c | 26 ---------------------
- 2 files changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/backlight.h b/arch/powerpc/include/asm/backlight.h
-index 1b5eab62ed047..061a910d74929 100644
---- a/arch/powerpc/include/asm/backlight.h
-+++ b/arch/powerpc/include/asm/backlight.h
-@@ -10,15 +10,14 @@
- #define __ASM_POWERPC_BACKLIGHT_H
- #ifdef __KERNEL__
- 
--#include <linux/fb.h>
- #include <linux/mutex.h>
- 
-+struct backlight_device;
-+
- /* For locking instructions, see the implementation file */
- extern struct backlight_device *pmac_backlight;
- extern struct mutex pmac_backlight_mutex;
- 
--extern int pmac_backlight_curve_lookup(struct fb_info *info, int value);
--
- extern int pmac_has_backlight_type(const char *type);
- 
- extern void pmac_backlight_key(int direction);
-diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
-index aeb79a8b3e109..12bc01353bd3c 100644
---- a/arch/powerpc/platforms/powermac/backlight.c
-+++ b/arch/powerpc/platforms/powermac/backlight.c
-@@ -9,7 +9,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/fb.h>
- #include <linux/backlight.h>
- #include <linux/adb.h>
- #include <linux/pmu.h>
-@@ -72,31 +71,6 @@ int pmac_has_backlight_type(const char *type)
-       return 0;
- }
- 
--int pmac_backlight_curve_lookup(struct fb_info *info, int value)
--{
--      int level = (FB_BACKLIGHT_LEVELS - 1);
--
--      if (info && info->bl_dev) {
--              int i, max = 0;
--
--              /* Look for biggest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)
--                      max = max((int)info->bl_curve[i], max);
--
--              /* Look for nearest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {
--                      int diff = abs(info->bl_curve[i] - value);
--                      if (diff < max) {
--                              max = diff;
--                              level = i;
--                      }
--              }
--
--      }
--
--      return level;
--}
--
- static void pmac_backlight_key_worker(struct work_struct *work)
- {
-       if (atomic_read(&kernel_backlight_disabled))
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 9b427825489147d0bab791fd6c470a172f4f1ba3..331de7b0db77a9d6ac125159129cd9b0bf592eb3 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -487,7 +487,6 @@ backlight-lm3630a-don-t-set-bl-props.brightness-in-g.patch
 backlight-da9052-fully-initialize-backlight_properti.patch
 backlight-lm3639-fully-initialize-backlight_properti.patch
 backlight-lp8788-fully-initialize-backlight_properti.patch
-arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
 sparc32-fix-section-mismatch-in-leon_pci_grpci.patch
 clk-fix-clk_core_get-null-dereference.patch
 clk-zynq-prevent-null-pointer-dereference-caused-by-.patch

diff --git a/queue-6.7/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch b/queue-6.7/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
deleted file mode 100644 (file)
index 29d5adc..0000000
--- a/queue-6.7/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 6abb12e2065a3fe1a5c9941f814108794ba502a9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Mar 2024 13:28:20 +0100
-Subject: arch/powerpc: Remove <linux/fb.h> from backlight code
-
-From: Thomas Zimmermann <tzimmermann@suse.de>
-
-[ Upstream commit 838f865802b9f26135ea7df4e30f89ac2f50c23e ]
-
-Replace <linux/fb.h> with a forward declaration in <asm/backlight.h> to
-resolve an unnecessary dependency. Remove pmac_backlight_curve_lookup()
-and struct fb_info from source and header files. The function and the
-framebuffer struct are unused. No functional changes.
-
-v3:
-       * Add Fixes tag (Christophe)
-       * fix typos in commit message (Jani)
-
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Fixes: d565dd3b0824 ("[PATCH] powerpc: More via-pmu backlight fixes")
-Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au> # (powerpc)
-Link: https://patchwork.freedesktop.org/patch/msgid/20240306122935.10626-4-tzimmermann@suse.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/backlight.h        |  5 ++--
- arch/powerpc/platforms/powermac/backlight.c | 26 ---------------------
- 2 files changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/backlight.h b/arch/powerpc/include/asm/backlight.h
-index 1b5eab62ed047..061a910d74929 100644
---- a/arch/powerpc/include/asm/backlight.h
-+++ b/arch/powerpc/include/asm/backlight.h
-@@ -10,15 +10,14 @@
- #define __ASM_POWERPC_BACKLIGHT_H
- #ifdef __KERNEL__
- 
--#include <linux/fb.h>
- #include <linux/mutex.h>
- 
-+struct backlight_device;
-+
- /* For locking instructions, see the implementation file */
- extern struct backlight_device *pmac_backlight;
- extern struct mutex pmac_backlight_mutex;
- 
--extern int pmac_backlight_curve_lookup(struct fb_info *info, int value);
--
- extern int pmac_has_backlight_type(const char *type);
- 
- extern void pmac_backlight_key(int direction);
-diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
-index aeb79a8b3e109..12bc01353bd3c 100644
---- a/arch/powerpc/platforms/powermac/backlight.c
-+++ b/arch/powerpc/platforms/powermac/backlight.c
-@@ -9,7 +9,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/fb.h>
- #include <linux/backlight.h>
- #include <linux/adb.h>
- #include <linux/pmu.h>
-@@ -72,31 +71,6 @@ int pmac_has_backlight_type(const char *type)
-       return 0;
- }
- 
--int pmac_backlight_curve_lookup(struct fb_info *info, int value)
--{
--      int level = (FB_BACKLIGHT_LEVELS - 1);
--
--      if (info && info->bl_dev) {
--              int i, max = 0;
--
--              /* Look for biggest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)
--                      max = max((int)info->bl_curve[i], max);
--
--              /* Look for nearest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {
--                      int diff = abs(info->bl_curve[i] - value);
--                      if (diff < max) {
--                              max = diff;
--                              level = i;
--                      }
--              }
--
--      }
--
--      return level;
--}
--
- static void pmac_backlight_key_worker(struct work_struct *work)
- {
-       if (atomic_read(&kernel_backlight_disabled))
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 6edae9f80628fee212ebec4844c81ce4184066c7..6da57fdd24642a83f55ab71cbdb967f63bd54312 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -544,7 +544,6 @@ backlight-lm3630a-don-t-set-bl-props.brightness-in-g.patch
 backlight-da9052-fully-initialize-backlight_properti.patch
 backlight-lm3639-fully-initialize-backlight_properti.patch
 backlight-lp8788-fully-initialize-backlight_properti.patch
-arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
 sparc32-fix-section-mismatch-in-leon_pci_grpci.patch
 clk-fix-clk_core_get-null-dereference.patch
 clk-zynq-prevent-null-pointer-dereference-caused-by-.patch

diff --git a/queue-6.8/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch b/queue-6.8/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
deleted file mode 100644 (file)
index bfaf3f6..0000000
--- a/queue-6.8/arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 6873f153d744b21560e4409feb0f7a51b3258c6e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Mar 2024 13:28:20 +0100
-Subject: arch/powerpc: Remove <linux/fb.h> from backlight code
-
-From: Thomas Zimmermann <tzimmermann@suse.de>
-
-[ Upstream commit 838f865802b9f26135ea7df4e30f89ac2f50c23e ]
-
-Replace <linux/fb.h> with a forward declaration in <asm/backlight.h> to
-resolve an unnecessary dependency. Remove pmac_backlight_curve_lookup()
-and struct fb_info from source and header files. The function and the
-framebuffer struct are unused. No functional changes.
-
-v3:
-       * Add Fixes tag (Christophe)
-       * fix typos in commit message (Jani)
-
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Fixes: d565dd3b0824 ("[PATCH] powerpc: More via-pmu backlight fixes")
-Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au> # (powerpc)
-Link: https://patchwork.freedesktop.org/patch/msgid/20240306122935.10626-4-tzimmermann@suse.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/backlight.h        |  5 ++--
- arch/powerpc/platforms/powermac/backlight.c | 26 ---------------------
- 2 files changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/backlight.h b/arch/powerpc/include/asm/backlight.h
-index 1b5eab62ed047..061a910d74929 100644
---- a/arch/powerpc/include/asm/backlight.h
-+++ b/arch/powerpc/include/asm/backlight.h
-@@ -10,15 +10,14 @@
- #define __ASM_POWERPC_BACKLIGHT_H
- #ifdef __KERNEL__
- 
--#include <linux/fb.h>
- #include <linux/mutex.h>
- 
-+struct backlight_device;
-+
- /* For locking instructions, see the implementation file */
- extern struct backlight_device *pmac_backlight;
- extern struct mutex pmac_backlight_mutex;
- 
--extern int pmac_backlight_curve_lookup(struct fb_info *info, int value);
--
- extern int pmac_has_backlight_type(const char *type);
- 
- extern void pmac_backlight_key(int direction);
-diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
-index aeb79a8b3e109..12bc01353bd3c 100644
---- a/arch/powerpc/platforms/powermac/backlight.c
-+++ b/arch/powerpc/platforms/powermac/backlight.c
-@@ -9,7 +9,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/fb.h>
- #include <linux/backlight.h>
- #include <linux/adb.h>
- #include <linux/pmu.h>
-@@ -72,31 +71,6 @@ int pmac_has_backlight_type(const char *type)
-       return 0;
- }
- 
--int pmac_backlight_curve_lookup(struct fb_info *info, int value)
--{
--      int level = (FB_BACKLIGHT_LEVELS - 1);
--
--      if (info && info->bl_dev) {
--              int i, max = 0;
--
--              /* Look for biggest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)
--                      max = max((int)info->bl_curve[i], max);
--
--              /* Look for nearest value */
--              for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {
--                      int diff = abs(info->bl_curve[i] - value);
--                      if (diff < max) {
--                              max = diff;
--                              level = i;
--                      }
--              }
--
--      }
--
--      return level;
--}
--
- static void pmac_backlight_key_worker(struct work_struct *work)
- {
-       if (atomic_read(&kernel_backlight_disabled))
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index 940dd0206038e16efe3a0e7f7737b85e7c38d5e6..fb3674777d6cc24ec0323e1f872e28a85a1aa71e 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -526,7 +526,6 @@ backlight-lm3630a-don-t-set-bl-props.brightness-in-g.patch
 backlight-da9052-fully-initialize-backlight_properti.patch
 backlight-lm3639-fully-initialize-backlight_properti.patch
 backlight-lp8788-fully-initialize-backlight_properti.patch
-arch-powerpc-remove-linux-fb.h-from-backlight-code.patch
 sparc32-use-generic-cmpdi2-ucmpdi2-variants.patch
 mtd-maps-sun_uflash-declare-uflash_devinit-static.patch
 sparc32-do-not-select-generic_isa_dma.patch