From: lxoliva <lxoliva@559672b5-ba27-0410-b829-e8f1faed8b1b>
Date: Tue, 17 Apr 2012 03:14:16 +0000 (+0000)
Subject: Adjust for firmware_class.c (request_firmware et al) changes in 3.3.2.
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=4cbedb59b031d63f6d51625934000f0eb66fb3ec;p=releases.git

Adjust for firmware_class.c (request_firmware et al) changes in 3.3.2.


git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@8514 559672b5-ba27-0410-b829-e8f1faed8b1b
---

diff --git a/deblob-check b/deblob-check
index a600a2c568f..581bc8f6dfb 100755
--- a/deblob-check
+++ b/deblob-check
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# deblob-check version 2012-04-14
+# deblob-check version 2012-04-16
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -1145,7 +1145,7 @@ set_except () {
     accept '[	]-[ ]move[ ]firmware[ ]loading[ ]to[ ]request_firmware[(][)]' drivers/staging/slicoss/README
     accept 'config[ ]FIRMWARE_IN_KERNEL.*let[ ]firmware[ ]be[ ]loaded[ ]from[ ]userspace\.' drivers/base/Kconfig
     accept '[	 ]*and[ ]request_firmware[(][)][ ]in[ ]the[ ]source' drivers/base/Kconfig
-    accept '\(static[ ]int[\n ]\)\?_request_firmware[(]const[ ]struct[ ]firmware[ ][*][*]firmware_p,[^{]*[\n][{]\([\n]\+[^\n}][^\n]*\)*[^\n]*[\n]\+[}][\n]' drivers/base/firmware_class.c
+    accept '\(static[ ]\(int\|void\)[\n ]\)\?_request_firmware\(_prepare\|_cleanup\)\?[(]const[ ]struct[ ]firmware[ ][*][*]\?firmware\(_p\)\?[,)][^{]*[\n][{]\([\n]\+[^\n}][^\n]*\)*[^\n]*[\n]\+[}][\n]' drivers/base/firmware_class.c
     accept 'static[ ]int[\n ]request_firmware_work_func[(]void[ ][*]arg[)][\n][{]\([\n]\+[^\n}][^\n]*\)*ret[ ]=[ ]_request_firmware[(][^\n]*\([\n]\+[^\n}][^\n]*\)*[\n]\+[}][\n]' drivers/base/firmware_class.c
     accept '[/][*][*][\n][ ][*][ ]request_firmware:[ ]-[ ]send[ ]firmware[ ][^{]*[\n][{]\([\n]\+[^\n}][^\n]*\)*[^\n]*[\n]\+[}][\n]' drivers/base/firmware_class.c
     accept '[/][*][*][\n][ ][*][ ]request_firmware_nowait\(:\|[ ]-\)[ ]asynchronous[ ]version[^{]*[\n][{]\([\n]\+[^\n}][^\n]*\)*[^\n]*[\n]\+[}][\n]' drivers/base/firmware_class.c
@@ -3008,6 +3008,15 @@ set_except () {
     accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+' drivers/video/logo/logo_libre_clut224.ppm
     ;;
 
+  */patch-3.3*gnu*)
+    # These patterns are *way* too broad for general use, but they're fine
+    # for patches between deblob-checked releases.
+    accept 'static[ ]\(int\|void\)[ ]_request_firmware' drivers/base/firmware_class.c
+    accept 'request_firmware[(]const' drivers/base/firmware_class.c
+    accept '[	]*ret[ ]=[ ]_request_firmware' drivers/base/firmware_class.c
+    accept '[	]*_request_firmware_cleanup' drivers/base/firmware_class.c
+    ;;
+
   */drivers-media-update.patch)
     blobname 'dvb-usb-lme2510c\?-\(lg\|s7395\)\.fw' drivers/media/dvb/dvb-usb/lmedm04.c
     blobname 'dvb-usb-lme2510c\?-s0194\.fw' drivers/media/dvb/dvb-usb/lmedm04.c