Skip to contentSkip to conversation

staging: rt2860: remove reading a file from /etc

PATCH In review Sebastian Dalfuß 2 participants 2 messages Nov 5, 2009 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 staging: rt2860: remove reading a file from /etc

From: Sebastian Dalfuß <[email protected]>
Subject: [Patch 1/3] staging: rt2860: remove reading a file from /etc

This patch is based on 2.6.32-rc6

This patch removes the whole ugly reading-from-/etc stuff. No lines are added or modified, but a lot of lines (for loading and parsing the file from /etc) are removed. Nearly all removed lines had been in rt_profile.c, rest is header and the call of RTMPReadParametersHook() in rt_main_dev.c.

---

drivers/staging/rt2860/rt_linux.h +0 -6
diff -ru a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h
@@ -89,18 +89,12 @@
 /* order of "if defined()" is important, because for 3070 driver
    both RT2870 and RT3070 are defined */
 #if defined(RT2860)
- #define STA_PROFILE_PATH			"/etc/Wireless/RT2860STA/RT2860STA.dat"
- #define STA_RTMP_FIRMWARE_FILE_NAME "/etc/Wireless/RT2860STA/RT2860STA.bin"
  #define STA_NIC_DEVICE_NAME			"RT2860STA"
  #define STA_DRIVER_VERSION			"1.8.1.1"
 #elif defined(RT3070)
- #define STA_PROFILE_PATH			"/etc/Wireless/RT3070STA/RT3070STA.dat"
- #define STA_RT2870_IMAGE_FILE_NAME  "/etc/Wireless/RT3070STA/rt2870.bin"
  #define STA_NIC_DEVICE_NAME			"RT3070STA"
  #define STA_DRIVER_VERSION			"2.0.1.0"
 #elif defined(RT2870)
- #define STA_PROFILE_PATH			"/etc/Wireless/RT2870STA/RT2870STA.dat"
- #define STA_RT2870_IMAGE_FILE_NAME  "/etc/Wireless/RT2870STA/rt2870.bin"
  #define STA_NIC_DEVICE_NAME			"RT2870STA"
  #define STA_DRIVER_VERSION			"1.4.0.0"
 #endif
drivers/staging/rt2860/rt_main_dev.c +0 -8
diff -ru a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c
@@ -454,15 +454,7 @@
 		goto err3;
 	}
 
-	// Read parameters from Config File
-	Status = RTMPReadParametersHook(pAd);
-
 	printk("1. Phy Mode = %d\n", pAd->CommonCfg.PhyMode);
-	if (Status != NDIS_STATUS_SUCCESS)
-	{
-		DBGPRINT_ERR(("NICReadRegParameters failed, Status[=0x%08x]\n",Status));
-		goto err4;
-	}
 
 #ifdef RT2870
 	pAd->CommonCfg.bMultipleIRP = FALSE;
drivers/staging/rt2860/rt_profile.c +0 -1179

1,188 lines not on this page · raw message

drivers/staging/rt2860/TODO +0 -1
diff -ru a/drivers/staging/rt2860/TODO b/drivers/staging/rt2860/TODO
@@ -9,7 +9,6 @@
 	- checkpatch.pl clean
 	- sparse clean
 	- port to in-kernel 80211 stack and common rt2x00 infrastructure
-	- remove reading from /etc/ config files
 	- review by the wireless developer community
 
 Please send any patches or complaints about this driver to Greg
#1 lore raw

drivers/staging/rt2860/rt_linux.h

Quoted 16 lines · Sebastian Dalfu??

From: Sebastian Dalfu?? <[email protected]>
Subject: [Patch 1/3] staging: rt2860: remove reading a file from /etc

This patch is based on 2.6.32-rc6

This patch removes the whole ugly reading-from-/etc stuff. No lines are added or modified, but a lot of lines (for loading and parsing the file from /etc) are removed. Nearly all removed lines had been in rt_profile.c, rest is header and the call of RTMPReadParametersHook() in rt_main_dev.c.

---
diff -ru a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h

drivers/staging/rt2860/rt_linux.h +0 -0

This doesn't apply to my tree, as this file is deleted there. Can you please rediff these 3 patches against the linux-next tree as I asked so that they can be applied?

thanks,

greg k-h