From patchwork Fri Jan 22 14:27:23 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: 8090471 Return-Path: X-Original-To: patchwork-platform-driver-x86@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 46F33BEEE5 for ; Fri, 22 Jan 2016 14:28:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 724C4203A1 for ; Fri, 22 Jan 2016 14:28:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CC0F2042A for ; Fri, 22 Jan 2016 14:28:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754090AbcAVO2o (ORCPT ); Fri, 22 Jan 2016 09:28:44 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36052 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754092AbcAVO1z (ORCPT ); Fri, 22 Jan 2016 09:27:55 -0500 Received: by mail-lf0-f68.google.com with SMTP id t141so4144231lfd.3 for ; Fri, 22 Jan 2016 06:27:55 -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=qH48Vx1kyp0tI9uH7kqBOigtmgAlgHWq04F043bZShQ=; b=vLTkKiXawurFeW+BglXL6GThB28s6/k+5r/jCQCmGifveqwmRiq5zcboa2LRCp1//H EZ2N6sP93FSGxj/JDj7LUZ77sYfZt3HMJXAj0bEGBfVenDyUaFO181q3H2qZ1hwU3Au8 RoEAT/rPJ/Y41up/Br7ueB92j3U3JqSMGmwRs= 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=qH48Vx1kyp0tI9uH7kqBOigtmgAlgHWq04F043bZShQ=; b=je9WjnBOi9gQEZ194C6YWSKkDDuY2LQPnB/bmp+xgYPSceBVO6daaVZKM3ZN51tIbe LNfOkbQe1YQh6LA4DsPKirTOaMKovSs6615+BJmBKdIYyZoXnYtT3L7bQXslxKjuH3Y0 7KvfcP2lYTKh8hYv415YLdA96stksiGSRRpktz31WVKmZ3PJ2kEFTqHZPP+1V0BWO4pu H+x1c/iPvnjxFkD+3gvvl+P1IpdsrR/qGWm0k48EFdoqEZE2SsXGrB2N5jz1ph3mQD2x S1aqCBUDgJ77f+0aRsI+4GbvKSyvOWl7fywTLG1jvaZu8jaCHzznYxUQ+GU/+d/sP6TS 44cQ== X-Gm-Message-State: AG10YORnbhzzbiMKMvNpX5mW9UFXuTsDZLaRzUBdDggGxJjZXvvaSPRznmzWpFKdytu2tw== X-Received: by 10.25.26.68 with SMTP id a65mr1378039lfa.24.1453472874366; Fri, 22 Jan 2016 06:27:54 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2016 06:27:53 -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 11/16] dell-laptop: use dell_smbios_find_token() instead of find_token_id() Date: Fri, 22 Jan 2016 15:27:23 +0100 Message-Id: <1453472848-3118-12-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 Replace all uses of find_token_id() with dell_smbios_find_token() to avoid directly accessing the da_tokens table. Signed-off-by: Micha? K?pie? --- drivers/platform/x86/dell-laptop.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 5b200f2..4d1694d 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -1326,19 +1326,19 @@ static int kbd_set_state_safe(struct kbd_state *state, struct kbd_state *old) static int kbd_set_token_bit(u8 bit) { struct calling_interface_buffer *buffer; - int id; + struct calling_interface_token *token; int ret; if (bit >= ARRAY_SIZE(kbd_tokens)) return -EINVAL; - id = find_token_id(kbd_tokens[bit]); - if (id == -1) + token = dell_smbios_find_token(kbd_tokens[bit]); + if (!token) return -EINVAL; buffer = dell_smbios_get_buffer(); - buffer->input[0] = da_tokens[id].location; - buffer->input[1] = da_tokens[id].value; + buffer->input[0] = token->location; + buffer->input[1] = token->value; dell_smbios_send_request(1, 0); ret = buffer->output[0]; dell_smbios_release_buffer(); @@ -1349,19 +1349,19 @@ static int kbd_set_token_bit(u8 bit) static int kbd_get_token_bit(u8 bit) { struct calling_interface_buffer *buffer; - int id; + struct calling_interface_token *token; int ret; int val; if (bit >= ARRAY_SIZE(kbd_tokens)) return -EINVAL; - id = find_token_id(kbd_tokens[bit]); - if (id == -1) + token = dell_smbios_find_token(kbd_tokens[bit]); + if (!token) return -EINVAL; buffer = dell_smbios_get_buffer(); - buffer->input[0] = da_tokens[id].location; + buffer->input[0] = token->location; dell_smbios_send_request(0, 0); ret = buffer->output[0]; val = buffer->output[1]; @@ -1370,7 +1370,7 @@ static int kbd_get_token_bit(u8 bit) if (ret) return dell_smi_error(ret); - return (val == da_tokens[id].value); + return (val == token->value); } static int kbd_get_first_active_token_bit(void) @@ -1472,7 +1472,7 @@ static inline void kbd_init_tokens(void) int i; for (i = 0; i < ARRAY_SIZE(kbd_tokens); ++i) - if (find_token_id(kbd_tokens[i]) != -1) + if (dell_smbios_find_token(kbd_tokens[i])) kbd_token_bits |= BIT(i); }