From 96a51d06ccaeb2ca7e23d9e7b9b91c4a45471841 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 12 Aug 2009 16:37:26 -0700 Subject: Staging: rtl8192e: remove kernel version checks This removes a lot of code that is never built in to the driver. The size of the built code after this patch is identical to before it. Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/r819xE_firmware.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'drivers/staging/rtl8192e/r819xE_firmware.c') diff --git a/drivers/staging/rtl8192e/r819xE_firmware.c b/drivers/staging/rtl8192e/r819xE_firmware.c index 98fbd0c50281..6b62251d1ec3 100644 --- a/drivers/staging/rtl8192e/r819xE_firmware.c +++ b/drivers/staging/rtl8192e/r819xE_firmware.c @@ -20,9 +20,7 @@ #include "r819xE_firmware_img.h" #endif #include "r819xE_firmware.h" -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include -#endif void firmware_init_param(struct net_device *dev) { @@ -254,11 +252,7 @@ bool init_firmware(struct net_device *dev) * Download boot, main, and data image for System reset. * Download data image for firmware reseta */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) - priv->firmware_source = FW_SOURCE_HEADER_FILE; -#else priv->firmware_source = FW_SOURCE_IMG_FILE; -#endif for(init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) { /* * Open Image file, and map file to contineous memory if open file success. @@ -268,7 +262,6 @@ bool init_firmware(struct net_device *dev) switch(priv->firmware_source) { case FW_SOURCE_IMG_FILE: { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) if(pfirmware->firmware_buf_size[init_step] == 0) { rc = request_firmware(&fw_entry, fw_name[init_step],&priv->pdev->dev); if(rc < 0 ) { @@ -300,15 +293,12 @@ bool init_firmware(struct net_device *dev) } //pfirmware->firmware_buf_size = file_length; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) if(rst_opt == OPT_SYSTEM_RESET) { release_firmware(fw_entry); } -#endif } mapped_file = pfirmware->firmware_buf[init_step]; file_length = pfirmware->firmware_buf_size[init_step]; -#endif break; } case FW_SOURCE_HEADER_FILE: -- cgit v1.2.3