ath: add a helper for processing reg data on init
authorLuis R. Rodriguez <rodrigue@qca.qualcomm.com>
Thu, 8 Dec 2011 18:29:23 +0000 (23:59 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Dec 2011 20:30:55 +0000 (15:30 -0500)
This has no functional change. The helper can be used later
for other things like country IE changes and following the CTL
for different countries.

Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Acked-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/regd.c

index 65ecb5bab25a2a0a0c1e64d5122397238ab1e0ca..ed4966fdb8d3859291264c6aaf94c2008bbee83c 100644 (file)
@@ -508,11 +508,7 @@ static void ath_regd_sanitize(struct ath_regulatory *reg)
        reg->current_rd = 0x64;
 }
 
-int
-ath_regd_init(struct ath_regulatory *reg,
-             struct wiphy *wiphy,
-             int (*reg_notifier)(struct wiphy *wiphy,
-                                 struct regulatory_request *request))
+static int __ath_regd_init(struct ath_regulatory *reg)
 {
        struct country_code_to_enum_rd *country = NULL;
        u16 regdmn;
@@ -583,7 +579,23 @@ ath_regd_init(struct ath_regulatory *reg,
        printk(KERN_DEBUG "ath: Regpair used: 0x%0x\n",
                reg->regpair->regDmnEnum);
 
+       return 0;
+}
+
+int
+ath_regd_init(struct ath_regulatory *reg,
+             struct wiphy *wiphy,
+             int (*reg_notifier)(struct wiphy *wiphy,
+                                 struct regulatory_request *request))
+{
+       int r;
+
+       r = __ath_regd_init(reg);
+       if (r)
+               return r;
+
        ath_regd_init_wiphy(reg, wiphy, reg_notifier);
+
        return 0;
 }
 EXPORT_SYMBOL(ath_regd_init);