remove some unneeded #ifdefs from dvb/ttusb-dec/ttusb_dec.c
PATCH 1/1 remove some unneeded #ifdefs from dvb/ttusb-dec/ttusb_dec.c
DVB_TTUSB_DEC selects CRC32, do the #ifdefs can be removed.
Signed-off-by Adrian Bunk <[email protected]>
drivers/media/dvb/ttusb-dec/ttusb_dec.c renamed from drivers/media/dvb/ttusb-dec/ttusb_dec.c.old +0 -8
@@ -28,11 +28,7 @@#include <linux/usb.h> #include <linux/interrupt.h> #include <linux/firmware.h> -#if defined(CONFIG_CRC32 ) || defined(CONFIG_CRC32_MODULE )#include <linux/crc32.h> -#else -#warning "CRC checking of firmware not available" -#endif #include <linux/init.h> #include "dmxdev.h"
@@ -1165,9 +1161,7 @@u16 firmware_csum =0 ;u16 firmware_csum_ns;u32 firmware_size_nl; -#if defined(CONFIG_CRC32 ) || defined(CONFIG_CRC32_MODULE )u32 crc32_csum, crc32_check, tmp; -#endif const struct firmware *fw_entry =NULL ;dprintk ("%s\n" , __FUNCTION__);
@@ -1189,7 +1183,6 @@/* a 32 bit checksum over the first 56 bytes of the DSP Code is stored at offset 56 of file, so use it to check if the firmware file is valid. */ -#if defined(CONFIG_CRC32 ) || defined(CONFIG_CRC32_MODULE ) crc32_csum =crc32 (~0L , firmware,56 ) ^ ~0L ;memcpy (&tmp, &firmware[56 ],4 ); crc32_check =htonl (tmp);
@@ -1199,7 +1192,6 @@ __FUNCTION__, crc32_csum, crc32_check);return -1 ; } -#endif memcpy (idstring, &firmware[36 ],20 ); idstring[20 ] ='\0' ;printk (KERN_INFO "ttusb_dec: found DSP code \"%s\".\n" , idstring);