From patchwork Fri Jan 22 14:27:15 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: 8090671 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 70AD09F859 for ; Fri, 22 Jan 2016 14:31:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67C6720460 for ; Fri, 22 Jan 2016 14:31:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 713B6203A1 for ; Fri, 22 Jan 2016 14:31:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754255AbcAVObW (ORCPT ); Fri, 22 Jan 2016 09:31:22 -0500 Received: from mail-lb0-f193.google.com ([209.85.217.193]:32781 "EHLO mail-lb0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753955AbcAVO1p (ORCPT ); Fri, 22 Jan 2016 09:27:45 -0500 Received: by mail-lb0-f193.google.com with SMTP id bc4so3647557lbc.0 for ; Fri, 22 Jan 2016 06:27:44 -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=STjC0pwNa16Vl4rxYf0dKJhybSPRcWs/eriL7h02vbs=; b=DRFPv4FsgX2VLq4T80ubadZMX+kY0x7O8nQKvsX5+hgg0cYL/Vu8+KVc7s3kZR/eU3 kUM4DJqh3KvbKaoacuxk3D2aqpcZBvITFOXNaA/C334wtSi9DrXgaCWyO37+yCIpMAVk 2lONuZtU5NkClxBQvbiolZoJZTSOEhpAH+MOo= 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=STjC0pwNa16Vl4rxYf0dKJhybSPRcWs/eriL7h02vbs=; b=TZHTOUmOiejZe59taatSDjCIOgjTMIendpG2aDCegm59veRsTwWUsYE9vOBF0NM3CZ EI3EMbEQl47oLF+v8yWvs+Sw/nSE5bxec/L1zC4gBn3nYFP02xLDTTE/EtpZfWWn6CT2 ieCZTcF7X1GGjoVaogaZCqllSz2ZOTMvd1HPDMJ+vq5mcnwaFyFd16O/5kkaWGOjh1T7 HuDqIyBP1iobMYtZFoJQ+0iT5fYQwYK86GHJ+6A5SuDVMnPAJNUIdHALw0bwe0kS/kxd tly+h1c2paar785jI6FB944iHIymV74lvuZUXLpXODjdIrqREpJQDoFMBuReebzBnY1u VLDA== X-Gm-Message-State: AG10YOSzkFWyTH8MZZxEwfMSv25NMWXqvpHRU+qE78nxvB+Eah2MpuVGmE8wX95io1sGGQ== X-Received: by 10.112.198.231 with SMTP id jf7mr1332253lbc.16.1453472864150; Fri, 22 Jan 2016 06:27:44 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2016 06:27:42 -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 03/16] dell-smbios: rename clear_buffer() to dell_smbios_clear_buffer() Date: Fri, 22 Jan 2016 15:27:15 +0100 Message-Id: <1453472848-3118-4-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 clear_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 | 12 ++++++------ drivers/platform/x86/dell-smbios.c | 6 +++--- drivers/platform/x86/dell-smbios.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 575b0df..90d75ce 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -425,7 +425,7 @@ static int dell_rfkill_set(void *data, bool blocked) if (ret != 0) goto out; - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = 0x2; dell_send_request(buffer, 17, 11); @@ -438,7 +438,7 @@ static int dell_rfkill_set(void *data, bool blocked) (status & BIT(0)) && !(status & BIT(16))) disable = 1; - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = (1 | (radio<<8) | (disable << 16)); dell_send_request(buffer, 17, 11); @@ -456,7 +456,7 @@ static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio, if (status & BIT(0)) { /* Has hw-switch, sync sw_state to BIOS */ int block = rfkill_blocked(rfkill); - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = (1 | (radio << 8) | (block << 16)); dell_send_request(buffer, 17, 11); } else { @@ -490,7 +490,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) return; } - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = 0x2; dell_send_request(buffer, 17, 11); @@ -525,7 +525,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data) ret = buffer->output[0]; status = buffer->output[1]; - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = 0x2; dell_send_request(buffer, 17, 11); @@ -626,7 +626,7 @@ static void dell_update_rfkill(struct work_struct *ignored) if (ret != 0) goto out; - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = 0x2; dell_send_request(buffer, 17, 11); diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c index f28778b..8b1a0dd 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-smbios.c @@ -43,15 +43,15 @@ EXPORT_SYMBOL_GPL(da_tokens); void dell_smbios_get_buffer(void) { mutex_lock(&buffer_mutex); - clear_buffer(); + dell_smbios_clear_buffer(); } EXPORT_SYMBOL_GPL(dell_smbios_get_buffer); -void clear_buffer(void) +void dell_smbios_clear_buffer(void) { memset(buffer, 0, sizeof(struct calling_interface_buffer)); } -EXPORT_SYMBOL_GPL(clear_buffer); +EXPORT_SYMBOL_GPL(dell_smbios_clear_buffer); void release_buffer(void) { diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h index ace16c1..c5e9474 100644 --- a/drivers/platform/x86/dell-smbios.h +++ b/drivers/platform/x86/dell-smbios.h @@ -39,7 +39,7 @@ extern struct calling_interface_buffer *buffer; extern struct calling_interface_token *da_tokens; void dell_smbios_get_buffer(void); -void clear_buffer(void); +void dell_smbios_clear_buffer(void); void release_buffer(void); struct calling_interface_buffer * dell_send_request(struct calling_interface_buffer *buffer,