From patchwork Fri Jan 22 14:27:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 8090411 Return-Path: X-Original-To: patchwork-platform-driver-x86@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 75A699F859 for ; Fri, 22 Jan 2016 14:28:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0F2F203F3 for ; Fri, 22 Jan 2016 14:28:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3192203A1 for ; Fri, 22 Jan 2016 14:28:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754073AbcAVO2Z (ORCPT ); Fri, 22 Jan 2016 09:28:25 -0500 Received: from mail-lb0-f194.google.com ([209.85.217.194]:32820 "EHLO mail-lb0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754122AbcAVO17 (ORCPT ); Fri, 22 Jan 2016 09:27:59 -0500 Received: by mail-lb0-f194.google.com with SMTP id bc4so3647825lbc.0 for ; Fri, 22 Jan 2016 06:27:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=qdp5J0u2uduhaGRJWkHRxeAPi29bvC6rzXm70rvtmG4=; b=TwVQ1Ky8wwExjYDu/cWycSuC5lu3whHPfnHBHZmubwEHdh+w5mKXr9HBAWz/14Qnlj WYQKIzJsVLkZxO2EZVNk6Ti0aZkjClfb3wP4uIro6J1NtQswT2i/fIyfUsZt+EdKeK0L 2Z63KYABdW8rd2C4sX6naQ6JmbmFvNXV0pGLw= 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:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=qdp5J0u2uduhaGRJWkHRxeAPi29bvC6rzXm70rvtmG4=; b=S1/FUHrw49ZN01J6aNLUBW6qZzqIjkxWwk+S6qoIVMTz+4Q5omvm2E0J8I11TaeE9L UMfel/djALGQ8wK/8RizVjDLkpbjc1DeelPqOxWTlavCTSutY+IeLmwECMuQZYjNhFvx cIG8fAU7FY0ah/mTs9E/iOUTp4+PQ+lf3a0d7aHb5NmuHV9lB8Sse3cdFonPa09KI6dw ON/JM1k71OZ/tdN9WV7O3JmN0rxFSRfajfQ0m2sh+cAOoBiJa78tenbCJEKgpDxPacYL IWsr2wzZMY+UqIrfbYD3xsX9qoQZ3+9rCKuXJqEd6ZeuQBUJDqet/XJMMCqFXoaWBKbY pwbg== X-Gm-Message-State: AG10YOSGfoKgmuTcM80FvnuYHQYMUn7sM7TIGXQRh8C33Nb1Vn814AYoFneW7/J4TjORDQ== X-Received: by 10.112.172.233 with SMTP id bf9mr1342137lbc.121.1453472877331; Fri, 22 Jan 2016 06:27:57 -0800 (PST) Received: from eudyptula.hq.kempniu.pl. (eudyptula.hq.kempniu.pl. [2001:6a0:200:83b0::fd5a]) by smtp.googlemail.com with ESMTPSA id o82sm912027lfo.47.2016.01.22.06.27.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2016 06:27:56 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Darren Hart , Matthew Garrett , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Richard Purdie , Jacek Anaszewski Cc: platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 13/16] dell-smbios: remove find_token_{id,location}() Date: Fri, 22 Jan 2016 15:27:25 +0100 Message-Id: <1453472848-3118-14-git-send-email-kernel@kempniu.pl> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1453472848-3118-1-git-send-email-kernel@kempniu.pl> References: <1453472848-3118-1-git-send-email-kernel@kempniu.pl> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 As dell-laptop has been changed to use dell_smbios_find_token() instead of find_token_id() and find_token_location(), these functions can be safely removed. Signed-off-by: Micha? K?pie? --- drivers/platform/x86/dell-smbios.c | 25 ------------------------- drivers/platform/x86/dell-smbios.h | 3 --- 2 files changed, 28 deletions(-) diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c index 43aafab..e313c16 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-smbios.c @@ -89,31 +89,6 @@ struct calling_interface_token *dell_smbios_find_token(int tokenid) } EXPORT_SYMBOL_GPL(dell_smbios_find_token); -int find_token_id(int tokenid) -{ - int i; - - for (i = 0; i < da_num_tokens; i++) { - if (da_tokens[i].tokenID == tokenid) - return i; - } - - return -1; -} -EXPORT_SYMBOL_GPL(find_token_id); - -int find_token_location(int tokenid) -{ - int id; - - id = find_token_id(tokenid); - if (id == -1) - return -1; - - return da_tokens[id].location; -} -EXPORT_SYMBOL_GPL(find_token_location); - static void __init parse_da_table(const struct dmi_header *dm) { /* Final token is a terminator, so we don't want to copy it */ diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h index 6f6dbe8..f17cf7b 100644 --- a/drivers/platform/x86/dell-smbios.h +++ b/drivers/platform/x86/dell-smbios.h @@ -43,7 +43,4 @@ void dell_smbios_release_buffer(void); void dell_smbios_send_request(int class, int select); struct calling_interface_token *dell_smbios_find_token(int tokenid); - -int find_token_id(int tokenid); -int find_token_location(int tokenid); #endif