1 files changed, 4 insertions, 25 deletions
diff --git a/deblob/deblob-5.10 b/deblob/deblob-5.10
index 48dc99acf62b..91b77345e44b 100755
--- a/deblob/deblob-5.10
+++ b/deblob/deblob-5.10
@@ -181,27 +181,15 @@ clean_sed () {
 }
 
 reject_firmware () {
-  #$1 = file $2 = pre sed pattern
-  filetest $1 || return 0
-  clean_sed "$2"'
-s,\(^\|[^>.0-9a-zA-Z_$]\)\(request\(_ihex\|_partial\)\?_firmware\|firmware_request_platform\)\(_nowait\|_direct\|_into_buf\)\?\($\|[^-.0-9a-zA-Z_$),; ]\),\1reject_firmware\4\5,g
-' "$1" 'disabled non-Free firmware-loading machinery'
+  return 0
 }
 
 reject_firmware_nowarn () {
-  #$1 = file $2 = pre sed pattern
-  filetest $1 || return 0
-  clean_sed "$2"'
-s,\(^\|[^>.0-9a-zA-Z_$]\)firmware_request_nowarn\($\|[^-.0-9a-zA-Z_$),; ]\),\1firmware_reject_nowarn\2,g
-' "$1" 'disabled silent non-Free firmware-loading machinery'
+  return 0
 }
 
 maybe_reject_firmware () {
-  #$1 = file $2 = pre sed pattern
-  filetest $1 || return 0
-  clean_sed "$2"'
-s,\(^\|[^>.0-9a-zA-Z_$]\)request_\(ihex_\|partial_\)\?firmware\(_nowait\|_direct\|_into_buf\)\?\($\|[^-.0-9a-zA-Z_$),; ]\),\1maybe_reject_\2firmware\3\4,g
-' "$1" 'retain Free firmware-loading machinery, disabling non-Free one'
+  return 0
 }
 
 undefine_macro () {
@@ -219,11 +207,7 @@ s,$macro,$repl,g;
 }
 
 undefault_firmware () {
-  #$1 - pattern such that $1_DEFAULT_FIRMWARE is #defined to non-Free firmware
-  #$@ other than $1 - file names
-  macro="$1"_DEFAULT_FIRMWARE; shift
-  undefine_macro "$macro" "\"/*(DEBLOBBED)*/\"" \
-    "disabled non-Free firmware" "$@"
+  return 0
 }
 
 # First, check that files that contain firmwares and their
@@ -605,11 +589,6 @@ maybe_reject_ihex_firmware(const struct firmware **fw,\
 #endif /* _LINUX_LIBRE_IHEX_H */\
 ' include/linux/ihex.h 'added non-Free ihex firmware notification support'
 
-clean_sed '
-s,\(timeout = \)\(firmware_loading_timeout()\),\1is_nonfree_firmware(name) ? 1 : \2,
-' drivers/base/firmware_loader/fallback.c 'shorten non-Free firmware fail-to-load timeout'
-
-
 ########
 # Arch #
 ########