[gentoo-commits] repo/gentoo:master commit in: sys-power/bbswitch/files/

[Joonas Niilola]

commit:     39efd4a46e9ce41195e9f9f2a8b82f3f71a0979a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep  8 10:00:23 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 07:22:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39efd4a4

sys-power/bbswitch: remove unused patches

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22244
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../bbswitch/files/bbswitch-0.8-kernel-4.12.patch  | 18 --------
 .../bbswitch/files/bbswitch-0.8-kernel-5.6.patch   | 52 ----------------------
 2 files changed, 70 deletions(-)

diff --git a/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch b/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch
deleted file mode 100644
index 1db623d583e..00000000000
--- a/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -uNr bbswitch-0.8/bbswitch.c bbswitch-0.8-new/bbswitch.c
---- bbswitch-0.8/bbswitch.c	2013-12-04 18:22:06.000000000 -0500
-+++ bbswitch-0.8-new/bbswitch.c	2017-07-08 01:11:54.588545766 -0400
-@@ -31,7 +31,14 @@
- #include <linux/pci.h>
- #include <linux/acpi.h>
- #include <linux/module.h>
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
-+#include <linux/uaccess.h>
-+#else
- #include <asm/uaccess.h>
-+#endif
-+
- #include <linux/suspend.h>
- #include <linux/seq_file.h>
- #include <linux/pm_runtime.h>

diff --git a/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch b/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch
deleted file mode 100644
index aa95a21cdb0..00000000000
--- a/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c2f808efeb0820edf23dbb66362ad3091321253f Mon Sep 17 00:00:00 2001
-From: Mateusz Mandera <mateusz.mandera@××××××××××.com>
-Date: Tue, 31 Mar 2020 15:11:30 +0200
-Subject: [PATCH] Use proc_ops structure for kernel version >= 5.6.0
-
-Since 5.6.0, proc_create requires a proc_ops* argument
-instead of file_operations*.
----
- bbswitch.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/bbswitch.c b/bbswitch.c
-index d64cdae..9ca0e42 100644
---- a/bbswitch.c
-+++ b/bbswitch.c
-@@ -42,6 +42,9 @@
- #include <linux/suspend.h>
- #include <linux/seq_file.h>
- #include <linux/pm_runtime.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
-+#include <linux/proc_fs.h>
-+#endif
- 
- #define BBSWITCH_VERSION "0.8"
- 
-@@ -382,6 +385,15 @@ static int bbswitch_pm_handler(struct notifier_block *nbp,
-     return 0;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
-+static struct proc_ops bbswitch_fops = {
-+    .proc_open   = bbswitch_proc_open,
-+    .proc_read   = seq_read,
-+    .proc_write  = bbswitch_proc_write,
-+    .proc_lseek = seq_lseek,
-+    .proc_release= single_release
-+};
-+#else
- static struct file_operations bbswitch_fops = {
-     .open   = bbswitch_proc_open,
-     .read   = seq_read,
-@@ -389,6 +401,7 @@ static struct file_operations bbswitch_fops = {
-     .llseek = seq_lseek,
-     .release= single_release
- };
-+#endif
- 
- static struct notifier_block nb = {
-     .notifier_call = &bbswitch_pm_handler
--- 
-2.26.0
-