From: Sasha Levin Date: Mon, 22 Jan 2024 10:35:19 +0000 (-0500) Subject: Drop gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch X-Git-Tag: v4.19.306~114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ef5624f7469354c164865032d65b9e9d7d52b04;p=thirdparty%2Fkernel%2Fstable-queue.git Drop gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.6/gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch b/queue-6.6/gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch deleted file mode 100644 index be684d695b1..00000000000 --- a/queue-6.6/gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5fb6e1ce8a95f76355e5a238b27ffa9cd43109c4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 27 Nov 2023 20:37:15 +0100 -Subject: gpio: sysfs: fix forward declaration of struct gpio_device - -From: Bartosz Golaszewski - -[ Upstream commit 58bfaaac03284d82a55a724bfe2d97e19f3a11d0 ] - -The forward declaration for struct gpio_device should be provided for -both branches of the #ifdef. - -Fixes: 08a149c40bdb ("gpiolib: Clean up headers") -Signed-off-by: Bartosz Golaszewski -Reviewed-by: Linus Walleij -Reviewed-by: Andy Shevchenko -Signed-off-by: Sasha Levin ---- - drivers/gpio/gpiolib-sysfs.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpio/gpiolib-sysfs.h b/drivers/gpio/gpiolib-sysfs.h -index 0f213bdb4732..b794b396d6a5 100644 ---- a/drivers/gpio/gpiolib-sysfs.h -+++ b/drivers/gpio/gpiolib-sysfs.h -@@ -3,10 +3,10 @@ - #ifndef GPIOLIB_SYSFS_H - #define GPIOLIB_SYSFS_H - --#ifdef CONFIG_GPIO_SYSFS -- - struct gpio_device; - -+#ifdef CONFIG_GPIO_SYSFS -+ - int gpiochip_sysfs_register(struct gpio_device *gdev); - void gpiochip_sysfs_unregister(struct gpio_device *gdev); - --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 8a0e8467adb..30d77f20f99 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -237,7 +237,6 @@ media-verisilicon-hook-the-try_-decoder_cmd-stateles.patch media-rkvdec-hook-the-try_-decoder_cmd-stateless-ioc.patch media-amphion-fix-vpu-core-alias-name.patch drm-bridge-fix-typo-in-post_disable-description.patch -gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch f2fs-fix-to-avoid-dirent-corruption.patch drm-radeon-r600_cs-fix-possible-int-overflows-in-r60.patch drm-radeon-r100-fix-integer-overflow-issues-in-r100_.patch diff --git a/queue-6.7/gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch b/queue-6.7/gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch deleted file mode 100644 index 2a0963a0bf8..00000000000 --- a/queue-6.7/gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1406da1b3e8af22810c1dbd85cb18fc9195e508f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 27 Nov 2023 20:37:15 +0100 -Subject: gpio: sysfs: fix forward declaration of struct gpio_device - -From: Bartosz Golaszewski - -[ Upstream commit 58bfaaac03284d82a55a724bfe2d97e19f3a11d0 ] - -The forward declaration for struct gpio_device should be provided for -both branches of the #ifdef. - -Fixes: 08a149c40bdb ("gpiolib: Clean up headers") -Signed-off-by: Bartosz Golaszewski -Reviewed-by: Linus Walleij -Reviewed-by: Andy Shevchenko -Signed-off-by: Sasha Levin ---- - drivers/gpio/gpiolib-sysfs.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpio/gpiolib-sysfs.h b/drivers/gpio/gpiolib-sysfs.h -index 0f213bdb4732..b794b396d6a5 100644 ---- a/drivers/gpio/gpiolib-sysfs.h -+++ b/drivers/gpio/gpiolib-sysfs.h -@@ -3,10 +3,10 @@ - #ifndef GPIOLIB_SYSFS_H - #define GPIOLIB_SYSFS_H - --#ifdef CONFIG_GPIO_SYSFS -- - struct gpio_device; - -+#ifdef CONFIG_GPIO_SYSFS -+ - int gpiochip_sysfs_register(struct gpio_device *gdev); - void gpiochip_sysfs_unregister(struct gpio_device *gdev); - --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index 74411f6d124..a226d31e95f 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -260,7 +260,6 @@ media-amphion-fix-vpu-core-alias-name.patch drm-sched-fix-bounds-limiting-when-given-a-malformed.patch drm-bridge-fix-typo-in-post_disable-description.patch drm-bridge-imx93-mipi-dsi-fix-a-couple-of-building-w.patch -gpio-sysfs-fix-forward-declaration-of-struct-gpio_de.patch f2fs-fix-to-avoid-dirent-corruption.patch revert-drm-bridge-add-200ms-delay-to-wait-fw-hpd-sta.patch fbdev-sm712fb-use-correct-initializer-macros-for-str.patch