Revert "Merge pull request 'patches/driver/bes2600/*-danctnix: reconstruct from cleanups (closes #29)' (#33) from claude-noether/kernel-agent:noether/kernel-agent-29-per-series-reconstruct into main"
This reverts commit38fd672940, reversing changes made to443f5e992e.
This commit is contained in:
+12
-12
@@ -1,7 +1,7 @@
|
||||
From 20d349e2b5bffe25c17af2612d179b42e27c7414 Mon Sep 17 00:00:00 2001
|
||||
From 8732881c5916106539b9071b51710489c57e8d73 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
Date: Wed, 22 Apr 2026 13:18:38 +0200
|
||||
Subject: [PATCH 03/29] bes2600: thread struct device * through factory
|
||||
Subject: [PATCH] bes2600: thread struct device * through factory
|
||||
request_firmware() call
|
||||
|
||||
Follow-up to \"bes2600: use request_firmware() for factory.txt read\".
|
||||
@@ -43,10 +43,10 @@ Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
bes2600/bes2600_sdio.c | 4 ++++
|
||||
3 files changed, 20 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/staging/bes2600/bes2600_factory.c b/drivers/staging/bes2600/bes2600_factory.c
|
||||
diff --git a/bes2600/bes2600_factory.c b/bes2600/bes2600_factory.c
|
||||
index 8d60b7c..1cda447 100644
|
||||
--- a/drivers/staging/bes2600/bes2600_factory.c
|
||||
+++ b/drivers/staging/bes2600/bes2600_factory.c
|
||||
--- a/bes2600/bes2600_factory.c
|
||||
+++ b/bes2600/bes2600_factory.c
|
||||
@@ -31,6 +31,18 @@
|
||||
|
||||
static DEFINE_MUTEX(factory_lock);
|
||||
@@ -75,10 +75,10 @@ index 8d60b7c..1cda447 100644
|
||||
if (ret) {
|
||||
bes_devel("BES2600: request_firmware(%s) failed: %d\n", path, ret);
|
||||
return -1;
|
||||
diff --git a/drivers/staging/bes2600/bes2600_factory.h b/drivers/staging/bes2600/bes2600_factory.h
|
||||
diff --git a/bes2600/bes2600_factory.h b/bes2600/bes2600_factory.h
|
||||
index 3835b0d..7dbe9f8 100644
|
||||
--- a/drivers/staging/bes2600/bes2600_factory.h
|
||||
+++ b/drivers/staging/bes2600/bes2600_factory.h
|
||||
--- a/bes2600/bes2600_factory.h
|
||||
+++ b/bes2600/bes2600_factory.h
|
||||
@@ -199,6 +199,9 @@ enum factory_cali_status {
|
||||
/* just calibrate 11n, other protocols are automatically mapped */
|
||||
#define WIFI_RF_11N_MODE 0x15
|
||||
@@ -89,10 +89,10 @@ index 3835b0d..7dbe9f8 100644
|
||||
/* read wifi & bt factory cali value*/
|
||||
u8* bes2600_get_factory_cali_data(u8 *file_buffer, u32 *data_len, char *path);
|
||||
void factory_little_endian_cvrt(u8 *data);
|
||||
diff --git a/drivers/staging/bes2600/bes2600_sdio.c b/drivers/staging/bes2600/bes2600_sdio.c
|
||||
diff --git a/bes2600/bes2600_sdio.c b/bes2600/bes2600_sdio.c
|
||||
index b595365..371ef4f 100644
|
||||
--- a/drivers/staging/bes2600/bes2600_sdio.c
|
||||
+++ b/drivers/staging/bes2600/bes2600_sdio.c
|
||||
--- a/bes2600/bes2600_sdio.c
|
||||
+++ b/bes2600/bes2600_sdio.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "bes2600.h"
|
||||
#include "sbus.h"
|
||||
@@ -112,5 +112,5 @@ index b595365..371ef4f 100644
|
||||
self->func = func;
|
||||
self->dev = &func->dev;
|
||||
--
|
||||
2.54.0
|
||||
2.53.0
|
||||
|
||||
Reference in New Issue
Block a user