Merge tag 'hardening-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[platform/kernel/linux-starfive.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 5e4cd85..7bcfaf5 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -379,10 +379,8 @@ struct dev_links_info {
  * @data:      Pointer to MSI device data
  */
 struct dev_msi_info {
-#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-       struct irq_domain       *domain;
-#endif
 #ifdef CONFIG_GENERIC_MSI_IRQ
+       struct irq_domain       *domain;
        struct msi_device_data  *data;
 #endif
 };
@@ -743,7 +741,7 @@ static inline void set_dev_node(struct device *dev, int node)
 
 static inline struct irq_domain *dev_get_msi_domain(const struct device *dev)
 {
-#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
+#ifdef CONFIG_GENERIC_MSI_IRQ
        return dev->msi.domain;
 #else
        return NULL;
@@ -752,7 +750,7 @@ static inline struct irq_domain *dev_get_msi_domain(const struct device *dev)
 
 static inline void dev_set_msi_domain(struct device *dev, struct irq_domain *d)
 {
-#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
+#ifdef CONFIG_GENERIC_MSI_IRQ
        dev->msi.domain = d;
 #endif
 }