cfg80211: reg: rename reg_regdb_query() to reg_query_builtin()

jmberg-intel · jmberg-intel · commit fd453d3c53ee · 2015-10-16T09:15:43.000+02:00
The new name better reflects the functionality.

Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
@@ -478,7 +478,7 @@ static void reg_regdb_apply(struct work_struct *work)
 
 static DECLARE_WORK(reg_regdb_work, reg_regdb_apply);
 
-static int reg_regdb_query(const char *alpha2)
+static int reg_query_builtin(const char *alpha2)
 {
 	const struct ieee80211_regdomain *regdom = NULL;
 	struct reg_regdb_apply_request *request;
@@ -521,7 +521,7 @@ static void reg_regdb_size_check(void)
 }
 #else
 static inline void reg_regdb_size_check(void) {}
-static inline int reg_regdb_query(const char *alpha2)
+static inline int reg_query_builtin(const char *alpha2)
 {
 	return -ENODATA;
 }
@@ -605,7 +605,7 @@ static inline int call_crda(const char *alpha2)
 static bool reg_query_database(struct regulatory_request *request)
 {
 	/* query internal regulatory database (if it exists) */
-	if (reg_regdb_query(request->alpha2) == 0)
+	if (reg_query_builtin(request->alpha2) == 0)
 		return true;
 
 	if (call_crda(request->alpha2) == 0)

Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ static void reg_regdb_apply(struct work_struct *work)`
`478`	`478`
`479`	`479`	`static DECLARE_WORK(reg_regdb_work, reg_regdb_apply);`
`480`	`480`
`481`		`-static int reg_regdb_query(const char *alpha2)`
	`481`	`+static int reg_query_builtin(const char *alpha2)`
`482`	`482`	`{`
`483`	`483`	`const struct ieee80211_regdomain *regdom = NULL;`
`484`	`484`	`struct reg_regdb_apply_request *request;`
`@@ -521,7 +521,7 @@ static void reg_regdb_size_check(void)`
`521`	`521`	`}`
`522`	`522`	`#else`
`523`	`523`	`static inline void reg_regdb_size_check(void) {}`
`524`		`-static inline int reg_regdb_query(const char *alpha2)`
	`524`	`+static inline int reg_query_builtin(const char *alpha2)`
`525`	`525`	`{`
`526`	`526`	`return -ENODATA;`
`527`	`527`	`}`
`@@ -605,7 +605,7 @@ static inline int call_crda(const char *alpha2)`
`605`	`605`	`static bool reg_query_database(struct regulatory_request *request)`
`606`	`606`	`{`
`607`	`607`	`/* query internal regulatory database (if it exists) */`
`608`		`- if (reg_regdb_query(request->alpha2) == 0)`
	`608`	`+ if (reg_query_builtin(request->alpha2) == 0)`
`609`	`609`	`return true;`
`610`	`610`
`611`	`611`	`if (call_crda(request->alpha2) == 0)`