Skip to content

Commit 415e842

Browse files
arndbMarc Zyngier
authored andcommitted
irqchip/gicv3: Add a iort_pmsi_get_dev_id() prototype
iort_pmsi_get_dev_id() has a __weak definition in the driver, and an override in arm64 specific code, but the declaration is conditional and not always seen when the copy in the driver gets built: drivers/irqchip/irq-gic-v3-its-platform-msi.c:41:12: error: no previous prototype for 'iort_pmsi_get_dev_id' [-Werror=missing-prototypes] Move the existing declaration out of the #ifdef block to ensure it can be seen in all configurations. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Hanjun Guo <guohanjun@huawei.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20230516200516.554663-5-arnd@kernel.org
1 parent 5b7e567 commit 415e842

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

include/linux/acpi_iort.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ int iort_register_domain_token(int trans_id, phys_addr_t base,
2626
struct fwnode_handle *fw_node);
2727
void iort_deregister_domain_token(int trans_id);
2828
struct fwnode_handle *iort_find_domain_token(int trans_id);
29+
int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id);
30+
2931
#ifdef CONFIG_ACPI_IORT
3032
void acpi_iort_init(void);
3133
u32 iort_msi_map_id(struct device *dev, u32 id);
3234
struct irq_domain *iort_get_device_domain(struct device *dev, u32 id,
3335
enum irq_domain_bus_token bus_token);
3436
void acpi_configure_pmsi_domain(struct device *dev);
35-
int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id);
3637
void iort_get_rmr_sids(struct fwnode_handle *iommu_fwnode,
3738
struct list_head *head);
3839
void iort_put_rmr_sids(struct fwnode_handle *iommu_fwnode,

0 commit comments

Comments
 (0)