From patchwork Mon Aug 10 02:33:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 6979161 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 346F5C05AC for ; Mon, 10 Aug 2015 02:34:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52D3A2070A for ; Mon, 10 Aug 2015 02:33:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6EAD4206E6 for ; Mon, 10 Aug 2015 02:33:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752667AbbHJCdz (ORCPT ); Sun, 9 Aug 2015 22:33:55 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:35108 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752505AbbHJCdt (ORCPT ); Sun, 9 Aug 2015 22:33:49 -0400 Received: by pacgr6 with SMTP id gr6so15836939pac.2 for ; Sun, 09 Aug 2015 19:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aVOMS40yJZxRA2TNP6F1vkfY5V5IpAT6gjuU57x7rTs=; b=Dmwp2Sv121mN+oSclfdTVQv4jPh314dCXoT8XBOUtv8SC1miYLwwSJkZRkVDtkA40G fe1Xnr4CaoO1kIzq/P2D30COX6OO/LKQI/xbZ0R/ayJmwLrIA+EGLqBvtIGNQ0KY0KbG RwFuJhAf2GL/7QCoEndMvkFy5QKD1v0+VVNedqXJ1Jve1JVCVzWP+i7/Lq2Aayriz2AN mB4A75jPwQMMlhNSIlFbh5TAKGlOzon6FJBci/otsN2wL07sJW2fuhG5YOQV8dNO31Y+ Js0BgmJsKZLOM8UQmeTFeIrSvGJt8FRsQl71JlYG331oianIAGnL5MkLDHJQBVA0b9Uy /Yrw== X-Received: by 10.66.255.67 with SMTP id ao3mr39667058pad.60.1439174028744; Sun, 09 Aug 2015 19:33:48 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id k10sm17650088pbq.63.2015.08.09.19.33.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 09 Aug 2015 19:33:48 -0700 (PDT) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, rachel.kim@atmel.com, dean.lee@atmel.com, chris.park@atmel.com, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, Chaehyun Lim Subject: [PATCH 07/11] staging: wilc1000: remove WILC_strncmp function Date: Mon, 10 Aug 2015 11:33:18 +0900 Message-Id: <1439174002-7365-7-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439174002-7365-1-git-send-email-chaehyun.lim@gmail.com> References: <1439174002-7365-1-git-send-email-chaehyun.lim@gmail.com> 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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Remove WILC_strncmp function that is changed to strncmp. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/wilc_strutils.c | 21 --------------------- drivers/staging/wilc1000/wilc_strutils.h | 20 -------------------- 2 files changed, 41 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_strutils.c b/drivers/staging/wilc1000/wilc_strutils.c index 337e62f..cc4e9fe 100644 --- a/drivers/staging/wilc1000/wilc_strutils.c +++ b/drivers/staging/wilc1000/wilc_strutils.c @@ -18,25 +18,4 @@ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, u32 u32Count) -s32 WILC_strncmp(const char *pcStr1, const char *pcStr2, - u32 u32Count) -{ - s32 s32Result; - - if (pcStr1 == NULL && pcStr2 == NULL) { - s32Result = 0; - } else if (pcStr1 == NULL) { - s32Result = -1; - } else if (pcStr2 == NULL) { - s32Result = 1; - } else { - s32Result = strncmp(pcStr1, pcStr2, u32Count); - if (s32Result < 0) - s32Result = -1; - else if (s32Result > 0) - s32Result = 1; - } - - return s32Result; -} diff --git a/drivers/staging/wilc1000/wilc_strutils.h b/drivers/staging/wilc1000/wilc_strutils.h index 86728d2..03f4938 100644 --- a/drivers/staging/wilc1000/wilc_strutils.h +++ b/drivers/staging/wilc1000/wilc_strutils.h @@ -60,26 +60,6 @@ static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, u32 u32Count -/*! - * @brief Compares two strings up to u32Count characters - * @details Compares 2 strings reporting which is bigger, NULL is considered - * the smallest string, then a zero length string then all other - * strings depending on thier ascii characters order with small case - * converted to uppder case - * @param[in] pcStr1 the first string, NULL is valid and considered smaller - * than any other non-NULL string (incliding zero lenght strings) - * @param[in] pcStr2 the second string, NULL is valid and considered smaller - * than any other non-NULL string (incliding zero lenght strings) - * @param[in] u32Count copying will proceed until a null character in pcStr1 or - * pcStr2 is encountered or u32Count of bytes copied - * @return 0 if the 2 strings are equal, 1 if pcStr1 is bigger than pcStr2, - * -1 if pcStr1 smaller than pcStr2 - * @author aabozaeid - * @date 7 Dec 2010 - * @version 1.0 - */ -s32 WILC_strncmp(const char *pcStr1, const char *pcStr2, - u32 u32Count); #endif