From patchwork Fri Jan 16 13:28:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 5648531 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6C97D9F357 for ; Fri, 16 Jan 2015 13:29:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98039201F4 for ; Fri, 16 Jan 2015 13:29:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEFE6201F2 for ; Fri, 16 Jan 2015 13:29:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752652AbbAPN2u (ORCPT ); Fri, 16 Jan 2015 08:28:50 -0500 Received: from mail-lb0-f179.google.com ([209.85.217.179]:47162 "EHLO mail-lb0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752494AbbAPN2s (ORCPT ); Fri, 16 Jan 2015 08:28:48 -0500 Received: by mail-lb0-f179.google.com with SMTP id z11so18432183lbi.10 for ; Fri, 16 Jan 2015 05:28:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id; bh=aa+cpzLcfQ/+JEKeEOT0gGxG2+BGiMb0XDxjX6oHcHg=; b=W6H2xbUms4/nhZ/N+3VNwdnexAf7N0qAkCDBtfCf1ZAyOcdyCo3I5rO4xK93aRfiSZ /XZWw73z/1svJwjruI+3eOljFCsqRAX/CKroxBCAinI2tjj6mNG2yHaiIg28BlXEBLdC iq/E7acXck3ILuCz5AQtWkM+iL9ekos6SQSXo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aa+cpzLcfQ/+JEKeEOT0gGxG2+BGiMb0XDxjX6oHcHg=; b=A7pcpC78uBDkAzV8Z83LJiVOn3QF4Ac375MNddF/kg5beB0UrbPFc7vS/iSgKqmzZh aOJyZMe0Qpem4WFEzqZ5mOzjU3ZPL4yAzbCzkPihiqNG7ewiNtUNYSmj7aniJHYX3p/q tojM3ezYzcJZywaTZo2vdD7uk0TvvhadieUevg4GoJP5ZUhBVgdAkyPGH0lI8mVM69dO o26s0wdT29nUKP8i4JKDhsCvj+XKO5d0BiAMhCGoc4fqCAS8Xl+ZmFL2L1BrkXKyaMRV 98aVwgWx8SNJKWrkVfPNlWD+VbnkKxIJNY/DPB/Uzckc9sAE9j/u4RWvQDyv/5Jry9l5 AGmw== X-Gm-Message-State: ALoCoQmBG1BssF7vqA3MgCL5FJpX0Rz5TYI2EaRwB/8yQKPYY1t+LFWQlKgnXfUNN78jlbA8If0m X-Received: by 10.152.8.11 with SMTP id n11mr15299912laa.38.1421414927256; Fri, 16 Jan 2015 05:28:47 -0800 (PST) Received: from spencer.imf.au.dk ([130.225.20.51]) by mx.google.com with ESMTPSA id zt4sm895848lbb.3.2015.01.16.05.28.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jan 2015 05:28:46 -0800 (PST) From: Rasmus Villemoes To: Simon Kelley , Kalle Valo Cc: Rasmus Villemoes , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: wireless: atmel: Remove open-coded and wrong strcasecmp Date: Fri, 16 Jan 2015 14:28:27 +0100 Message-Id: <1421414907-26764-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The kernel's string library does in fact have strcasecmp, at least since ded220bd8f08. Moreover, this open-coded version is in fact wrong: If the strings only differ in their last character, a and b have already been incremented to point to the terminating nul bytes, so they would be treated as equal. Signed-off-by: Rasmus Villemoes --- drivers/net/wireless/atmel.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 9183f1cf89a7..55db9f03eb2a 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -2699,16 +2698,7 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) domain[REGDOMAINSZ] = 0; rc = -EINVAL; for (i = 0; i < ARRAY_SIZE(channel_table); i++) { - /* strcasecmp doesn't exist in the library */ - char *a = channel_table[i].name; - char *b = domain; - while (*a) { - char c1 = *a++; - char c2 = *b++; - if (tolower(c1) != tolower(c2)) - break; - } - if (!*a && !*b) { + if (!strcasecmp(channel_table[i].name, domain)) { priv->config_reg_domain = channel_table[i].reg_domain; rc = 0; }