From patchwork Sun Apr 29 11:06:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 134663 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2663718lji; Sun, 29 Apr 2018 04:06:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrOO+JzQgGuwkrQ+TjbHkkFg7tyMM4W7mv+9uZ9zTKap8P91cUFzwYYMRYnWAoG2C1IO7Bj X-Received: by 2002:a63:5f0d:: with SMTP id t13-v6mr7394361pgb.145.1525000008977; Sun, 29 Apr 2018 04:06:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525000008; cv=none; d=google.com; s=arc-20160816; b=s1A6HWhJOhQT7Vt/Sm7ohs3bhvqEF/KVa8M11UJmRTnII+UpR9xk4ZpoGyXpAA5fVT 9g+HQ9+vFj1xsNIcHl9hH+gysxhEoKl22GwqurjMB6/1zcMaPfBWoeIc5OurX6v8AQ9Y uxZwhl1vkvbJDdKLMLAgAxhQpxlr2iE68cSJYG4Axg9YmIAYw3dpw99VKB8Gp4g2BJlB QUuZEFh369NA4T2CfR1KFdC5MHIQVzP/83icRnzWHYSjpRemUvvsnXRbqmmgZM78f5OH w8W+ZUxgSkfkHaWZWkdGRVsfm9vOWA5XpDY0E0TTV6Pg8x+TkpgcWHc5N7Zu12Ti0Q72 mPSQ== 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=z6IgqYzHWl7sYWUT53ILpidxq2MOil5amSbNQZ2JAQA=; b=dN0zKtZK2ONPH0Vx+1W4v+a62sOt3HClmWOH/iREJpdAMwxSaMLt5+bSEDi6PA2mWb cfH9LigIl+TvoYbmn8jjfznnJLo1rJ2muypVOsF7Q25e0X57cxzo3pXJkCcRCp50AFf5 dhCXSUGCyeYQdbnyxcwPg4Sczutzc6qDxtMuNH0cBfoblmM0pPDMlqnwuIVkTFQxF8fG pPBA59gDWl5+hl5HsbvQ/VWlx2QkRQxc+cQOgimowOWpNPXYhAz84dfH8cRm2xynjMQ3 G47iCXEsxAVl663j5bP69ynIIO76jdUITTzROYn0R/carT+l1bJSPULN2J91o1Dt1nDg 8x5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hRmzXzTN; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (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 z1-v6si5369654plo.263.2018.04.29.04.06.48; Sun, 29 Apr 2018 04:06:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hRmzXzTN; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753033AbeD2LGs (ORCPT + 2 others); Sun, 29 Apr 2018 07:06:48 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:54830 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752964AbeD2LGr (ORCPT ); Sun, 29 Apr 2018 07:06:47 -0400 Received: by mail-wm0-f66.google.com with SMTP id f6so8872989wmc.4 for ; Sun, 29 Apr 2018 04:06:47 -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=OvdDsSbv/V0fUxuKhbecNNPpIIGA1s86w1LgsmoagDs=; b=hRmzXzTNFxJ2ELJqsC2+zNMMnLGEW1ONA76DHppXSMeOoGIW7O247HVXr4YlJjjm8I A8XegSSrc1Gf23IOumnC3dJqjXpi0gZL9zmW1bLM9VM+u3UKmFo30zrcrPbUd1wFU+ou k7eahI0G8pefoY8jZ8HcKEwIe5fyLK5tAhMno= 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=OvdDsSbv/V0fUxuKhbecNNPpIIGA1s86w1LgsmoagDs=; b=bFgTtEp5MO1Aqg+K0+Tt9XIuhEVTaH44+qP2asxO3PzOjmLiq76XpM3RkdMUqoz5GH gRdH9LrW1RLLpdF7NhLtS237wLIZSN1ieWgBxyLSlzJ1CQZR6+iWUsE8b+0NdY9r2/0b uFBNSlhLMf3DLKPES+uaMce7hBQeabjr8O2paeNTlVryhghPBDzOSMxEqSgApCZUSaLH mtlq4qKcfnum/a+i+rWQW+EmXMggJzxGQJwwhylryigh1uLa0njHLsBcqh+CsqIxhRsB a94b3qPZb2YRA1Qo4QMZp/JiBLKXBXRqoK0AA01OJWqEeODtZzq32PCj5eFFuTaaAagC 0CWw== X-Gm-Message-State: ALQs6tDdRgpNsdM9cp5ynWHgc0zfMHcEVNoxoy0zJMrpiPiBPRp6hHH9 X6xJOTLyxbG8x6KzozWhl/VFeA== X-Received: by 10.28.110.30 with SMTP id j30mr4796519wmc.62.1525000006571; Sun, 29 Apr 2018 04:06:46 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:3995:5470:200:1aff:fe1b:b328]) by smtp.gmail.com with ESMTPSA id a13-v6sm4783275wrc.19.2018.04.29.04.06.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Apr 2018 04:06:45 -0700 (PDT) From: Ard Biesheuvel To: mingo@kernel.org, hdegoede@redhat.com, linux-efi@vger.kernel.org Cc: lukas@wunner.de, Ard Biesheuvel Subject: [PATCH v4 2/4] efi: align efi_pci_io_protocol typedefs to type naming convention Date: Sun, 29 Apr 2018 13:06:21 +0200 Message-Id: <20180429110623.13949-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180429110623.13949-1-ard.biesheuvel@linaro.org> References: <20180429110623.13949-1-ard.biesheuvel@linaro.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@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. 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 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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