From patchwork Mon Feb 1 22:06:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 60976 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp351952lbb; Mon, 1 Feb 2016 14:11:02 -0800 (PST) X-Received: by 10.66.253.170 with SMTP id ab10mr42055676pad.125.1454364662600; Mon, 01 Feb 2016 14:11:02 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oj11si26918876pab.106.2016.02.01.14.11.01; Mon, 01 Feb 2016 14:11:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@codeblueprint-co-uk.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932784AbcBAWLA (ORCPT + 30 others); Mon, 1 Feb 2016 17:11:00 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36618 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932491AbcBAWHQ (ORCPT ); Mon, 1 Feb 2016 17:07:16 -0500 Received: by mail-wm0-f49.google.com with SMTP id p63so91642852wmp.1 for ; Mon, 01 Feb 2016 14:07:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeblueprint-co-uk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QElQ9djtx+xfO/bivajCSxUhEsjAcd7Nlipoh7xDRqI=; b=aT2UDadg4eBv+i0llxm5jVBNCBm7wJUAt3NxJfP9KO925jLw4IyVL+n1Q3ef5NmHIe PkVCR8QcVFk0WfxIppBocmApYZ6M3Oo1fojFjjOj2QXb5svMi+gz4cG3o+DUXlS5jSeL z2q+oYZU4od5km/OPq3yMzmXAzJme62Y9ONKLQDGQkaee3RAVZD34VqXxKjtdxRggDIw Hm1kEuj5qfVrzl5+ftXyLG5uVVF4SOEpRonhJ9U7dfwAxlhO4Ok14c/IC4yuQbv1uddp NQG2PMW6Nd7mCc+ZMe6ciX1qntk7gkndGUe2T0Le9FKRAH25OWAmX3x5cp4mbSA74vkx +hTg== 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; bh=QElQ9djtx+xfO/bivajCSxUhEsjAcd7Nlipoh7xDRqI=; b=ES92hRz1d+DJiMRx8r69BucD0SqP6UOyC+/HBHzcrOKDENrYVa5YQVP3OhFM84Tv30 PEjOokrQcH4ZukLAJUIfEZp0dDf9IMUfEXcAwDxQ7t4umHzv/aSGpxwZPA4i4M9NXXc7 iq5O/8u/AEIa9DXkgtFdGPrRSKkHxCLhKFRXgTbRWRqfcWJkL0C+mueVCIpRZMTpWaXZ 6r/1HFLKV+MPHzKPlVCXtJFGE7AXB2FEvXOVqx51ArwsOhhQgzWw9TQ3ucYV2CL9x49X 4OmYjSeiA82yub8hWdych15dG5mXNbwjuemGn07cvJ52YpPMcB0cfvWwWoUzjMPfAz47 UJeA== X-Gm-Message-State: AG10YOTUZ880jwj6KOWBeutJFZzG2sVE2BxJ4VMqlbvBfXL7LZ2Hgq7tHnVeJjHqKKkW+g== X-Received: by 10.194.209.129 with SMTP id mm1mr27303245wjc.47.1454364435804; Mon, 01 Feb 2016 14:07:15 -0800 (PST) Received: from localhost (5ec16434.skybroadband.com. [94.193.100.52]) by smtp.gmail.com with ESMTPSA id k130sm13535912wmg.6.2016.02.01.14.07.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Feb 2016 14:07:15 -0800 (PST) From: Matt Fleming To: Ingo Molnar , "H . Peter Anvin" , Thomas Gleixner Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Ard Biesheuvel , Matt Fleming Subject: [PATCH 02/14] efi: Remove redundant efi_set_variable_nonblocking prototype Date: Mon, 1 Feb 2016 22:06:56 +0000 Message-Id: <1454364428-494-3-git-send-email-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1454364428-494-1-git-send-email-matt@codeblueprint.co.uk> References: <1454364428-494-1-git-send-email-matt@codeblueprint.co.uk> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel 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 --- include/linux/efi.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.6.2 diff --git a/include/linux/efi.h b/include/linux/efi.h index 569b5a866bb1..8706e0aabedc 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; };