Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp2534770pxb; Fri, 25 Mar 2022 20:52:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8+pI94tWz3TIDS7VXQIwMJfF2geeUCTJrlLeIEs6XKE8+5CExnC6NZQHevXo1b0yxLL6P X-Received: by 2002:a05:6402:4402:b0:418:ff4c:f102 with SMTP id y2-20020a056402440200b00418ff4cf102mr2317609eda.365.1648266736440; Fri, 25 Mar 2022 20:52:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648266736; cv=none; d=google.com; s=arc-20160816; b=JXhSrMu2oEkLA2Vy3dgSImqWefkvjC4eVqaRSCtB+Y+ympLX2GtFSOozdLksOjpaW4 KiqrzeI/GTzC8DmNO6LefkGGrAt8uyGElTRbTWu0THUQzFj78L5gnQMHrdDGyvlgcTt7 Kg7ft1eiAz+Bdcj4z7SGbON0SEJSEmo/ynS81dOdDBNuFa5MeRPXiKTFmiWRLuAKtR4f f4weKBxicho+KAvnrNtdYFq/VzHGposXfIWQ6y0SePeM/OOaAaPx358xPZRMey/d4e3k WpdhNnx8KzbSmVNhMmHlS5bL6FzfbHrx9SmHR3BKefsdTbsOhSaksGfLlyHgWHAvJLA5 oKDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=ekjuxXfa8UcBsDYNDKaLPh1EQWMAtrKFbiCjEvudHgo=; b=VZZ3HEymWdmNiekWvGOOi+60lTDHVjSTU4oWD4/mKP+2UV9pYyAM4bVRXQUai7CTzM JKF+jOoAqg5JhLRpFc/0R2g9d8gWYXCpVN7rZ012nH6w3zqDa1+2hNJrenU4xhOOYCfD 1ObfUfUxYEt+d0P19uZOvkHC2XXP6vBf5HrqS8YYyOWVoFawoFfD6rKa5fAb32Kt/vxJ GZ6ZD9OG7ZphcOMSypLD6Z14fBRGOFlJ5FasTFjwRqJBy7gWmi71nHbm4g2X2s8ckySq g35bOHvf3au5fxZcyuf1Xs59+XOgiJyy1T0dAnPxto0/IapWyb+S+TOamEVCCAxiXodX seJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k6-20020aa7c386000000b00418c2b5bd72si4825672edq.84.2022.03.25.20.51.38; Fri, 25 Mar 2022 20:52:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230149AbiCZBzS (ORCPT + 99 others); Fri, 25 Mar 2022 21:55:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230143AbiCZBzQ (ORCPT ); Fri, 25 Mar 2022 21:55:16 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FB5B972C2; Fri, 25 Mar 2022 18:53:41 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KQMPs3W3KzCrDl; Sat, 26 Mar 2022 09:51:29 +0800 (CST) Received: from localhost.localdomain (10.175.103.91) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Sat, 26 Mar 2022 09:53:38 +0800 From: Wei Li To: Peter Kaestle , Hans de Goede , Mark Gross CC: , , Subject: [PATCH] platform/x86: acerhdf: Cleanup str_starts_with() Date: Sat, 26 Mar 2022 10:02:49 +0800 Message-ID: <20220326020249.3266561-1-liwei391@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since there is already a generic function strstarts() that check if a string starts with a given prefix, cleanup str_starts_with(). Signed-off-by: Wei Li --- drivers/platform/x86/acerhdf.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index 6b8b3ab8db48..3c589437b41e 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c @@ -584,21 +584,6 @@ static struct platform_driver acerhdf_driver = { .remove = acerhdf_remove, }; -/* checks if str begins with start */ -static int str_starts_with(const char *str, const char *start) -{ - unsigned long str_len = 0, start_len = 0; - - str_len = strlen(str); - start_len = strlen(start); - - if (str_len >= start_len && - !strncmp(str, start, start_len)) - return 1; - - return 0; -} - /* check hardware */ static int __init acerhdf_check_hardware(void) { @@ -651,9 +636,9 @@ static int __init acerhdf_check_hardware(void) * check if actual hardware BIOS vendor, product and version * IDs start with the strings of BIOS table entry */ - if (str_starts_with(vendor, bt->vendor) && - str_starts_with(product, bt->product) && - str_starts_with(version, bt->version)) { + if (strstarts(vendor, bt->vendor) && + strstarts(product, bt->product) && + strstarts(version, bt->version)) { found = 1; break; } -- 2.25.1