From patchwork Fri May 4 05:59:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 134949 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp437762lji; Thu, 3 May 2018 23:02:13 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqnbg85ukNYg2EtKJzd9k2Z7Oq8ESQAjwBRtvNVABoSXNG+6uuihA3Dhe5Vu5H/Hzv7iJUs X-Received: by 2002:a63:af4b:: with SMTP id s11-v6mr5735541pgo.346.1525413733654; Thu, 03 May 2018 23:02:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525413733; cv=none; d=google.com; s=arc-20160816; b=mqtccmxtcAVj6wXADtagsbxzM7CQsEcluTADZKwXjc77MdPKd0m1fCdizg7yWvbJyF tLeo4ocmZVzOacHjVVIOrdlWKKpFVDtTk4sFrkZRyFF+qYcDXLrPbnIYyWFDwYmpxn3E v1L4FNEbH7hn0+vqtVdXVtrqiJLcQa+AkpcHgrP1orASBnO4XFdckn5ZTgtCjGX0tIIS 2vrrDEj6wOH+VnNHs7xIYMhtfGEndWZaelPB4VEdz0jHEg0BWn8BGcVb9iCx7dTvyWNj +zFh9jWC6RHHKcjTwQWm4P0kew1iyZbuDm/g8sODPePpdFlh6WvXNJCCbdeOS0nyqpVR yEXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=6taZDPxxgrV3AxESikJkl6YD5t26n9jJPsjR8j6vi4U=; b=RwvAcVjcAR5448OHgc77vQ7dz/Vo3VmDMpyxhdrwieJBHa/cVp0zIIG/r2S6o9GlhY j5CCQHnw7199vTb081EllWPuTitqRgyy/j6kRiXFKscwEK2/xeFwW+dtvo8r2LfeCMng 1Ro9LNIKhfIX+VG8mrcGzwOOIBlEzC6Es3lLvdxtfu2NiSkaimdFjZkMp1yWybz+a11b lL62XPcEhWXFK/uvTheS0JQl+L8zZbQpcY9Q1/DXfqls/C1V87P7gpaPhQ1vsV3+P7yD vBNJqDp1uPA6uaSh0b/c2D01lOsoUB0vth6mLoRC+NrEdZjMMZm4PcaF4n+IRqC9mpLv aVRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HJWlORgc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w16-v6si15270939plk.79.2018.05.03.23.02.13; Thu, 03 May 2018 23:02:13 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=HJWlORgc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751774AbeEDGBc (ORCPT + 29 others); Fri, 4 May 2018 02:01:32 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35148 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751726AbeEDGB1 (ORCPT ); Fri, 4 May 2018 02:01:27 -0400 Received: by mail-wm0-f67.google.com with SMTP id o78-v6so2576819wmg.0 for ; Thu, 03 May 2018 23:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6taZDPxxgrV3AxESikJkl6YD5t26n9jJPsjR8j6vi4U=; b=HJWlORgccgvDA6WE7XwPpxoJSKVYm2/SSffQrNDJOHUTfS5VkWzZLsn+g1uMQfanat F3lbTDX1Ucl/r1326LN65rki8AYEKJpcs9ij7YD9aW6v0tlzZO7RaBX39FKpDUeaV2eE i+NRej6+70PLV8GJWChHkxvNJ0ZISOf2H13Kk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6taZDPxxgrV3AxESikJkl6YD5t26n9jJPsjR8j6vi4U=; b=f4oWSz8HVCfGLMfKK0o3GkPUYzqzBS+p/Z1hubXi3teaohW2dlQsXSDVmWpqxnDvjF bvID/DO/sjBRJGT3m7NXIT2942b7Od9qjZvDlLYbhND3N9wkqSsB0ui7mWFQgbLUKFjB VCcpIyg8JxzMi800uWQ4Gqx8WJ8xV5TXag+CM8Ha26VAZIxKJpEv5AoWeImXM1TiaQnO HZpoZqgDCh7O8r1hFr+f3fZL+qZNiWClqHWyIiNkqZqyvUXORqVWQdJLAIzWNpU/K5UG y7+B7tnmS0mUCTDf+bhQvYsp1kp+v6P6ul6Py2hTmKc6vYJBaJ3d0c4C3vZxNulRqdKI dnSg== X-Gm-Message-State: ALQs6tAB8B3G8QbXNg/4GfCboGXvvnU2fV4JdNDSAS4TMooJQwjbE9JQ u39nK+0buVQW5NVP0fZLYlXZRHKjOR8= X-Received: by 10.28.51.201 with SMTP id z192mr14901785wmz.147.1525413686563; Thu, 03 May 2018 23:01:26 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:3995:5470:200:1aff:fe1b:b328]) by smtp.gmail.com with ESMTPSA id i30-v6sm32411863wra.38.2018.05.03.23.01.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 23:01:25 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org Subject: [PATCH 13/17] efi: align efi_pci_io_protocol typedefs to type naming convention Date: Fri, 4 May 2018 07:59:59 +0200 Message-Id: <20180504060003.19618-14-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504060003.19618-1-ard.biesheuvel@linaro.org> References: <20180504060003.19618-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to use the helper macros that perform type mangling with the EFI PCI I/O protocol struct typedefs, align their Linux typenames with the convention we use for definitionns that originate in the UEFI spec, and add the trailing _t to each. Tested-by: Hans de Goede Signed-off-by: Ard Biesheuvel --- arch/x86/boot/compressed/eboot.c | 8 ++++---- include/linux/efi.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) -- 2.17.0 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 09f36c0d9d4f..3994f48c4043 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -109,7 +109,7 @@ void efi_char16_printk(efi_system_table_t *table, efi_char16_t *str) } static efi_status_t -__setup_efi_pci32(efi_pci_io_protocol_32 *pci, struct pci_setup_rom **__rom) +__setup_efi_pci32(efi_pci_io_protocol_32_t *pci, struct pci_setup_rom **__rom) { struct pci_setup_rom *rom = NULL; efi_status_t status; @@ -176,7 +176,7 @@ static void setup_efi_pci32(struct boot_params *params, void **pci_handle, unsigned long size) { - efi_pci_io_protocol_32 *pci = NULL; + efi_pci_io_protocol_32_t *pci = NULL; efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID; u32 *handles = (u32 *)(unsigned long)pci_handle; efi_status_t status; @@ -218,7 +218,7 @@ setup_efi_pci32(struct boot_params *params, void **pci_handle, } static efi_status_t -__setup_efi_pci64(efi_pci_io_protocol_64 *pci, struct pci_setup_rom **__rom) +__setup_efi_pci64(efi_pci_io_protocol_64_t *pci, struct pci_setup_rom **__rom) { struct pci_setup_rom *rom; efi_status_t status; @@ -284,7 +284,7 @@ static void setup_efi_pci64(struct boot_params *params, void **pci_handle, unsigned long size) { - efi_pci_io_protocol_64 *pci = NULL; + efi_pci_io_protocol_64_t *pci = NULL; efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID; u64 *handles = (u64 *)(unsigned long)pci_handle; efi_status_t status; diff --git a/include/linux/efi.h b/include/linux/efi.h index 3016d8c456bc..56add823f190 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -397,7 +397,7 @@ typedef struct { u32 set_bar_attributes; u64 romsize; u32 romimage; -} efi_pci_io_protocol_32; +} efi_pci_io_protocol_32_t; typedef struct { u64 poll_mem; @@ -417,7 +417,7 @@ typedef struct { u64 set_bar_attributes; u64 romsize; u64 romimage; -} efi_pci_io_protocol_64; +} efi_pci_io_protocol_64_t; typedef struct { void *poll_mem; @@ -437,7 +437,7 @@ typedef struct { void *set_bar_attributes; uint64_t romsize; void *romimage; -} efi_pci_io_protocol; +} efi_pci_io_protocol_t; #define EFI_PCI_IO_ATTRIBUTE_ISA_MOTHERBOARD_IO 0x0001 #define EFI_PCI_IO_ATTRIBUTE_ISA_IO 0x0002