From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756095AbcBCLce (ORCPT ); Wed, 3 Feb 2016 06:32:34 -0500 Received: from terminus.zytor.com ([198.137.202.10]:55591 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754512AbcBCLc3 (ORCPT ); Wed, 3 Feb 2016 06:32:29 -0500 Date: Wed, 3 Feb 2016 03:31:23 -0800 From: tip-bot for Ard Biesheuvel Message-ID: Cc: hpa@zytor.com, brgerst@gmail.com, peterz@infradead.org, dvlasenk@redhat.com, ard.biesheuvel@linaro.org, matt@codeblueprint.co.uk, torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, tglx@linutronix.de Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, bp@alien8.de, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, peterz@infradead.org, ard.biesheuvel@linaro.org, dvlasenk@redhat.com, brgerst@gmail.com, hpa@zytor.com In-Reply-To: <1454364428-494-3-git-send-email-matt@codeblueprint.co.uk> References: <1454364428-494-3-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi: Remove redundant efi_set_variable_nonblocking () prototype Git-Commit-ID: 70d2a3cf2f4ae2e93b7a661842d84c2b5132cee7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 70d2a3cf2f4ae2e93b7a661842d84c2b5132cee7 Gitweb: http://git.kernel.org/tip/70d2a3cf2f4ae2e93b7a661842d84c2b5132cee7 Author: Ard Biesheuvel AuthorDate: Mon, 1 Feb 2016 22:06:56 +0000 Committer: Ingo Molnar CommitDate: Wed, 3 Feb 2016 11:31:02 +0100 efi: Remove redundant efi_set_variable_nonblocking() prototype There is no need for a separate nonblocking prototype definition for the SetVariable() UEFI Runtime Service, since it is identical to the blocking version. Signed-off-by: Ard Biesheuvel Signed-off-by: Matt Fleming Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1454364428-494-3-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- include/linux/efi.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/linux/efi.h b/include/linux/efi.h index 569b5a8..8706e0a 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -507,10 +507,6 @@ typedef efi_status_t efi_get_next_variable_t (unsigned long *name_size, efi_char typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor, u32 attr, unsigned long data_size, void *data); -typedef efi_status_t -efi_set_variable_nonblocking_t(efi_char16_t *name, efi_guid_t *vendor, - u32 attr, unsigned long data_size, void *data); - typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count); typedef void efi_reset_system_t (int reset_type, efi_status_t status, unsigned long data_size, efi_char16_t *data); @@ -851,7 +847,7 @@ extern struct efi { efi_get_variable_t *get_variable; efi_get_next_variable_t *get_next_variable; efi_set_variable_t *set_variable; - efi_set_variable_nonblocking_t *set_variable_nonblocking; + efi_set_variable_t *set_variable_nonblocking; efi_query_variable_info_t *query_variable_info; efi_update_capsule_t *update_capsule; efi_query_capsule_caps_t *query_capsule_caps; @@ -1091,7 +1087,7 @@ struct efivar_operations { efi_get_variable_t *get_variable; efi_get_next_variable_t *get_next_variable; efi_set_variable_t *set_variable; - efi_set_variable_nonblocking_t *set_variable_nonblocking; + efi_set_variable_t *set_variable_nonblocking; efi_query_variable_store_t *query_variable_store; };