From patchwork Fri Jan 22 14:27:14 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: 8090381 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 B19AB9F859 for ; Fri, 22 Jan 2016 14:28:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADBFC203A1 for ; Fri, 22 Jan 2016 14:28:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9823C203F3 for ; Fri, 22 Jan 2016 14:28:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754123AbcAVO16 (ORCPT ); Fri, 22 Jan 2016 09:27:58 -0500 Received: from mail-lb0-f193.google.com ([209.85.217.193]:36477 "EHLO mail-lb0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753909AbcAVO1o (ORCPT ); Fri, 22 Jan 2016 09:27:44 -0500 Received: by mail-lb0-f193.google.com with SMTP id ad5so3153478lbc.3 for ; Fri, 22 Jan 2016 06:27:43 -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=5sX60pIWHmT2PXAyUbSqwnJCgFkhjUYQKvF5t74dPUE=; b=VDXiNUjRhhXzgN3F//74zgo7R5rh//fGw2GdAbojmbMrBbm8eB4XNN5HXeE3MwMXd7 juBG0el66CbeN1zeyCwd91kZx4emSNfHt2HxaTgYETu/yty3joS07PyXs+qy34eMrNCR LAoETFZ2eFvPjGcjYN7AxXHkD/M7v++qo+v8U= 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=5sX60pIWHmT2PXAyUbSqwnJCgFkhjUYQKvF5t74dPUE=; b=bRxIaBWrXWL2YSe8S+MWOUotS5oMyarzzfzd/TjeosyUk9YDeOwhmJbEdex89g5PTA Gb1OLjlDj06qnJOBF2XZjqasFwThNUcJPIt0Dj9iPZ+AhAe18NeopEvN9DgqJQYzqLdO 5ngE/zQ6AL22SBA1otKHg+zmDUD1IPpBBBfgzNxL0oV/UEU0t37geryv7twGlW/6CiNA OYDUtNEVqKc5W1Itj8wOrlYZ9u9CPdgjPtkr1j3km4MKpciDUw5ZN5RSGbifln4x491b yn2LwZEeMwHVemvBs313L3y8RKUxe1CKwNDOXUwi2jds52w8iqSPyFVJh6FCsa6a3uOh q0uA== X-Gm-Message-State: AG10YOSE3W6pnpj0hBJxUcVHmydX6VejJNoirF/DC3V108ASj3F9R0byT0XN1eL7CAqLXQ== X-Received: by 10.112.219.138 with SMTP id po10mr1310576lbc.135.1453472862460; Fri, 22 Jan 2016 06:27:42 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2016 06:27:41 -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 02/16] dell-smbios: rename get_buffer() to dell_smbios_get_buffer() Date: Fri, 22 Jan 2016 15:27:14 +0100 Message-Id: <1453472848-3118-3-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 get_buffer() is exported from the module, it has to be renamed to something less generic, so add a "dell_smbios_" prefix to the function name. Signed-off-by: Micha? K?pie? --- drivers/platform/x86/dell-laptop.c | 26 +++++++++++++------------- drivers/platform/x86/dell-smbios.c | 4 ++-- drivers/platform/x86/dell-smbios.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index d45d356..575b0df 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -416,7 +416,7 @@ static int dell_rfkill_set(void *data, bool blocked) int status; int ret; - get_buffer(); + dell_smbios_get_buffer(); dell_send_request(buffer, 17, 11); ret = buffer->output[0]; @@ -479,7 +479,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) int status; int ret; - get_buffer(); + dell_smbios_get_buffer(); dell_send_request(buffer, 17, 11); ret = buffer->output[0]; @@ -519,7 +519,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data) int status; int ret; - get_buffer(); + dell_smbios_get_buffer(); dell_send_request(buffer, 17, 11); ret = buffer->output[0]; @@ -617,7 +617,7 @@ static void dell_update_rfkill(struct work_struct *ignored) int status; int ret; - get_buffer(); + dell_smbios_get_buffer(); dell_send_request(buffer, 17, 11); ret = buffer->output[0]; @@ -709,7 +709,7 @@ static int __init dell_setup_rfkill(void) if (!force_rfkill && !whitelisted) return 0; - get_buffer(); + dell_smbios_get_buffer(); dell_send_request(buffer, 17, 11); ret = buffer->output[0]; status = buffer->output[1]; @@ -873,7 +873,7 @@ static int dell_send_intensity(struct backlight_device *bd) if (token == -1) return -ENODEV; - get_buffer(); + dell_smbios_get_buffer(); buffer->input[0] = token; buffer->input[1] = bd->props.brightness; @@ -897,7 +897,7 @@ static int dell_get_intensity(struct backlight_device *bd) if (token == -1) return -ENODEV; - get_buffer(); + dell_smbios_get_buffer(); buffer->input[0] = token; if (power_supply_is_system_supplied() > 0) @@ -1157,7 +1157,7 @@ static int kbd_get_info(struct kbd_info *info) u8 units; int ret; - get_buffer(); + dell_smbios_get_buffer(); buffer->input[0] = 0x0; dell_send_request(buffer, 4, 11); @@ -1245,7 +1245,7 @@ static int kbd_get_state(struct kbd_state *state) { int ret; - get_buffer(); + dell_smbios_get_buffer(); buffer->input[0] = 0x1; dell_send_request(buffer, 4, 11); @@ -1276,7 +1276,7 @@ static int kbd_set_state(struct kbd_state *state) { int ret; - get_buffer(); + dell_smbios_get_buffer(); buffer->input[0] = 0x2; buffer->input[1] = BIT(state->mode_bit) & 0xFFFF; buffer->input[1] |= (state->triggers & 0xFF) << 16; @@ -1323,7 +1323,7 @@ static int kbd_set_token_bit(u8 bit) if (id == -1) return -EINVAL; - get_buffer(); + dell_smbios_get_buffer(); buffer->input[0] = da_tokens[id].location; buffer->input[1] = da_tokens[id].value; dell_send_request(buffer, 1, 0); @@ -1346,7 +1346,7 @@ static int kbd_get_token_bit(u8 bit) if (id == -1) return -EINVAL; - get_buffer(); + dell_smbios_get_buffer(); buffer->input[0] = da_tokens[id].location; dell_send_request(buffer, 0, 0); ret = buffer->output[0]; @@ -2017,7 +2017,7 @@ static int __init dell_init(void) token = find_token_location(BRIGHTNESS_TOKEN); if (token != -1) { - get_buffer(); + dell_smbios_get_buffer(); buffer->input[0] = token; dell_send_request(buffer, 0, 2); if (buffer->output[0] == 0) diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c index e08cf78..f28778b 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-smbios.c @@ -40,12 +40,12 @@ static int da_num_tokens; struct calling_interface_token *da_tokens; EXPORT_SYMBOL_GPL(da_tokens); -void get_buffer(void) +void dell_smbios_get_buffer(void) { mutex_lock(&buffer_mutex); clear_buffer(); } -EXPORT_SYMBOL_GPL(get_buffer); +EXPORT_SYMBOL_GPL(dell_smbios_get_buffer); void clear_buffer(void) { diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h index 3bc9080..ace16c1 100644 --- a/drivers/platform/x86/dell-smbios.h +++ b/drivers/platform/x86/dell-smbios.h @@ -38,7 +38,7 @@ struct calling_interface_token { extern struct calling_interface_buffer *buffer; extern struct calling_interface_token *da_tokens; -void get_buffer(void); +void dell_smbios_get_buffer(void); void clear_buffer(void); void release_buffer(void); struct calling_interface_buffer *