From patchwork Fri Jan 22 14:27:17 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: 8090741 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 128A99F96D for ; Fri, 22 Jan 2016 14:33:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E11AD20395 for ; Fri, 22 Jan 2016 14:33:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1C7620434 for ; Fri, 22 Jan 2016 14:33:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754240AbcAVObS (ORCPT ); Fri, 22 Jan 2016 09:31:18 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33227 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754029AbcAVO1s (ORCPT ); Fri, 22 Jan 2016 09:27:48 -0500 Received: by mail-lf0-f68.google.com with SMTP id z62so4198391lfd.0 for ; Fri, 22 Jan 2016 06:27:47 -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=0iFcZe+byZ4e7+vtMn0/Ig4S6SWWEC3nC/zBIOfqHbw=; b=tqxqm4Xu37NbOGvjQA2TaqFgzlbbsigXkkKg/ya5Zc8O0THaD47cNcZH4Jy+8op5Fj lZkSSUXA+3w5YlmbFGeEf/iVAbv2x7yPlK/XI0Evedm8dGG0Dla+UXto+StJYLU1ytBA Sd1CMGhM2kNClBaeyd5+8J8ajtLjGFjwMbAB4= 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=0iFcZe+byZ4e7+vtMn0/Ig4S6SWWEC3nC/zBIOfqHbw=; b=NGE1FXY9kU2PBtYJR5lYYjudcd9TMr6GJZMD2pQbI+0Sr7HeGyPy/6UfjVF5PqXIkK fMRFPxurZm6gBfxeZeaAWltiQaJZbhgJDZiWOSdMH8teU8vCHBpmhIGFCTXXKjxycW4s 5h4qjTZcbsaq9HwgD/oS1pOKvcAQvh1rize8oJBd+qAwD9N2U5kvIXJ3rgDl+SluvVM/ TVzmZpy+EHiom/V/7NWK/VzETDJo20O++unkVw4gLa4JCdP/um9y3ltNQzVOKqxvY+7y NlEQGLFbOrBeN0dY5cs0eCALXhP9rjDIogQ+b9yi8xmMnilTXGdBXcXf1Y9Gi4CE2v9q Jpnw== X-Gm-Message-State: AG10YOQUf23+I2rzVjtkK6qCbcqp1X5YrL+7o4D5/X0N/CTo56aORgLdvwSt4pCyoEAbOw== X-Received: by 10.25.166.143 with SMTP id p137mr1471881lfe.116.1453472866796; Fri, 22 Jan 2016 06:27:46 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2016 06:27:45 -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 05/16] dell-smbios: rename dell_send_request() to dell_smbios_send_request() Date: Fri, 22 Jan 2016 15:27:17 +0100 Message-Id: <1453472848-3118-6-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=unavailable 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_send_request() is exported from the module, its prefix should be consistent with other exported symbols, so change function name to dell_smbios_send_request(). Signed-off-by: Micha? K?pie? --- drivers/platform/x86/dell-laptop.c | 42 ++++++++++++++++++------------------ drivers/platform/x86/dell-smbios.c | 6 +++--- drivers/platform/x86/dell-smbios.h | 4 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index b47dc5a..9210acf 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -418,7 +418,7 @@ static int dell_rfkill_set(void *data, bool blocked) dell_smbios_get_buffer(); - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); ret = buffer->output[0]; status = buffer->output[1]; @@ -428,7 +428,7 @@ static int dell_rfkill_set(void *data, bool blocked) dell_smbios_clear_buffer(); buffer->input[0] = 0x2; - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); ret = buffer->output[0]; hwswitch = buffer->output[1]; @@ -441,7 +441,7 @@ static int dell_rfkill_set(void *data, bool blocked) dell_smbios_clear_buffer(); buffer->input[0] = (1 | (radio<<8) | (disable << 16)); - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); ret = buffer->output[0]; out: @@ -458,7 +458,7 @@ static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio, int block = rfkill_blocked(rfkill); dell_smbios_clear_buffer(); buffer->input[0] = (1 | (radio << 8) | (block << 16)); - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); } else { /* No hw-switch, sync BIOS state to sw_state */ rfkill_set_sw_state(rfkill, !!(status & BIT(radio + 16))); @@ -481,7 +481,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) dell_smbios_get_buffer(); - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); ret = buffer->output[0]; status = buffer->output[1]; @@ -493,7 +493,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) dell_smbios_clear_buffer(); buffer->input[0] = 0x2; - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); ret = buffer->output[0]; hwswitch = buffer->output[1]; @@ -521,14 +521,14 @@ static int dell_debugfs_show(struct seq_file *s, void *data) dell_smbios_get_buffer(); - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); ret = buffer->output[0]; status = buffer->output[1]; dell_smbios_clear_buffer(); buffer->input[0] = 0x2; - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); hwswitch_ret = buffer->output[0]; hwswitch_state = buffer->output[1]; @@ -619,7 +619,7 @@ static void dell_update_rfkill(struct work_struct *ignored) dell_smbios_get_buffer(); - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); ret = buffer->output[0]; status = buffer->output[1]; @@ -629,7 +629,7 @@ static void dell_update_rfkill(struct work_struct *ignored) dell_smbios_clear_buffer(); buffer->input[0] = 0x2; - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); ret = buffer->output[0]; if (ret == 0 && (status & BIT(0))) @@ -710,7 +710,7 @@ static int __init dell_setup_rfkill(void) return 0; dell_smbios_get_buffer(); - dell_send_request(buffer, 17, 11); + dell_smbios_send_request(buffer, 17, 11); ret = buffer->output[0]; status = buffer->output[1]; dell_smbios_release_buffer(); @@ -878,9 +878,9 @@ static int dell_send_intensity(struct backlight_device *bd) buffer->input[1] = bd->props.brightness; if (power_supply_is_system_supplied() > 0) - dell_send_request(buffer, 1, 2); + dell_smbios_send_request(buffer, 1, 2); else - dell_send_request(buffer, 1, 1); + dell_smbios_send_request(buffer, 1, 1); ret = dell_smi_error(buffer->output[0]); @@ -901,9 +901,9 @@ static int dell_get_intensity(struct backlight_device *bd) buffer->input[0] = token; if (power_supply_is_system_supplied() > 0) - dell_send_request(buffer, 0, 2); + dell_smbios_send_request(buffer, 0, 2); else - dell_send_request(buffer, 0, 1); + dell_smbios_send_request(buffer, 0, 1); if (buffer->output[0]) ret = dell_smi_error(buffer->output[0]); @@ -1160,7 +1160,7 @@ static int kbd_get_info(struct kbd_info *info) dell_smbios_get_buffer(); buffer->input[0] = 0x0; - dell_send_request(buffer, 4, 11); + dell_smbios_send_request(buffer, 4, 11); ret = buffer->output[0]; if (ret) { @@ -1248,7 +1248,7 @@ static int kbd_get_state(struct kbd_state *state) dell_smbios_get_buffer(); buffer->input[0] = 0x1; - dell_send_request(buffer, 4, 11); + dell_smbios_send_request(buffer, 4, 11); ret = buffer->output[0]; if (ret) { @@ -1284,7 +1284,7 @@ static int kbd_set_state(struct kbd_state *state) buffer->input[1] |= (state->timeout_unit & 0x3) << 30; buffer->input[2] = state->als_setting & 0xFF; buffer->input[2] |= (state->level & 0xFF) << 16; - dell_send_request(buffer, 4, 11); + dell_smbios_send_request(buffer, 4, 11); ret = buffer->output[0]; dell_smbios_release_buffer(); @@ -1326,7 +1326,7 @@ static int kbd_set_token_bit(u8 bit) dell_smbios_get_buffer(); buffer->input[0] = da_tokens[id].location; buffer->input[1] = da_tokens[id].value; - dell_send_request(buffer, 1, 0); + dell_smbios_send_request(buffer, 1, 0); ret = buffer->output[0]; dell_smbios_release_buffer(); @@ -1348,7 +1348,7 @@ static int kbd_get_token_bit(u8 bit) dell_smbios_get_buffer(); buffer->input[0] = da_tokens[id].location; - dell_send_request(buffer, 0, 0); + dell_smbios_send_request(buffer, 0, 0); ret = buffer->output[0]; val = buffer->output[1]; dell_smbios_release_buffer(); @@ -2019,7 +2019,7 @@ static int __init dell_init(void) if (token != -1) { dell_smbios_get_buffer(); buffer->input[0] = token; - dell_send_request(buffer, 0, 2); + dell_smbios_send_request(buffer, 0, 2); if (buffer->output[0] == 0) max_intensity = buffer->output[3]; dell_smbios_release_buffer(); diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c index 2607d1c..a0c1bde 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-smbios.c @@ -60,8 +60,8 @@ void dell_smbios_release_buffer(void) EXPORT_SYMBOL_GPL(dell_smbios_release_buffer); struct calling_interface_buffer * -dell_send_request(struct calling_interface_buffer *buffer, - int class, int select) +dell_smbios_send_request(struct calling_interface_buffer *buffer, + int class, int select) { struct smi_cmd command; @@ -78,7 +78,7 @@ dell_send_request(struct calling_interface_buffer *buffer, return buffer; } -EXPORT_SYMBOL_GPL(dell_send_request); +EXPORT_SYMBOL_GPL(dell_smbios_send_request); int find_token_id(int tokenid) { diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h index 8558103..33ed971 100644 --- a/drivers/platform/x86/dell-smbios.h +++ b/drivers/platform/x86/dell-smbios.h @@ -42,8 +42,8 @@ void dell_smbios_get_buffer(void); void dell_smbios_clear_buffer(void); void dell_smbios_release_buffer(void); struct calling_interface_buffer * -dell_send_request(struct calling_interface_buffer *buffer, - int class, int select); +dell_smbios_send_request(struct calling_interface_buffer *buffer, + int class, int select); int find_token_id(int tokenid); int find_token_location(int tokenid);