summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-12-03 18:59:58 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-01-03 13:01:25 +0100
commitd4f2c8819a51f31ef0f929574ce8d80b323c6a76 (patch)
tree7d1ba2528b5306a88eb8514f8bf3b659d9ed4f40 /net
parentregulatory: simplify restore_regulatory_settings (diff)
downloadlinux-d4f2c8819a51f31ef0f929574ce8d80b323c6a76.tar.xz
linux-d4f2c8819a51f31ef0f929574ce8d80b323c6a76.zip
regulatory: remove redundant isalpha() check
toupper() only modifies lower-case letters, so the isalpha() check is redundant; remove it. Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 87daba95639c..946cd5320ef9 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1614,10 +1614,8 @@ static void reg_todo(struct work_struct *work)
static void queue_regulatory_request(struct regulatory_request *request)
{
- if (isalpha(request->alpha2[0]))
- request->alpha2[0] = toupper(request->alpha2[0]);
- if (isalpha(request->alpha2[1]))
- request->alpha2[1] = toupper(request->alpha2[1]);
+ request->alpha2[0] = toupper(request->alpha2[0]);
+ request->alpha2[1] = toupper(request->alpha2[1]);
spin_lock(&reg_requests_lock);
list_add_tail(&request->list, &reg_requests_list);