Forward the email. -----邮件原件----- 发件人: tip-bot2@xxxxxxxxxxxxx <tip-bot2@xxxxxxxxxxxxx> 发送时间: 2025年5月22日 3:38 收件人: linux-tip-commits@xxxxxxxxxxxxxxx 抄送: Hans Zhang <hans.zhang@xxxxxxxxxxx>; Thomas Gleixner <tglx@xxxxxxxxxxxxx>; x86@xxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx 主题: [tip: irq/msi] PCI/MSI: Use bool for MSI enable state tracking [You don't often get email from tip-bot2@xxxxxxxxxxxxx. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] EXTERNAL EMAIL CAUTION: Suspicious Email from unusual domain. The following commit has been merged into the irq/msi branch of tip: Commit-ID: 4e7bca76e3fed58437dcd7f747d1c8d98507379e Gitweb: https://git.kernel.org/tip/4e7bca76e3fed58437dcd7f747d1c8d98507379e Author: Hans Zhang <hans.zhang@xxxxxxxxxxx> AuthorDate: Sat, 17 May 2025 00:52:22 +08:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Wed, 21 May 2025 21:28:53 +02:00 PCI/MSI: Use bool for MSI enable state tracking Convert pci_msi_enable and pci_msi_enabled() to use bool type for clarity. No functional changes, only code cleanup. Signed-off-by: Hans Zhang <hans.zhang@xxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/all/20250516165223.125083-2-18255117159@xxxxxxx --- drivers/pci/msi/api.c | 2 +- drivers/pci/msi/msi.c | 4 ++-- drivers/pci/msi/msi.h | 2 +- include/linux/pci.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c index e686400..818d55f 100644 --- a/drivers/pci/msi/api.c +++ b/drivers/pci/msi/api.c @@ -399,7 +399,7 @@ EXPORT_SYMBOL_GPL(pci_restore_msi_state); * Return: true if MSI has not been globally disabled through ACPI FADT, * PCI bridge quirks, or the "pci=nomsi" kernel command-line option. */ -int pci_msi_enabled(void) +bool pci_msi_enabled(void) { return pci_msi_enable; } diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index 593bae2..80ac764 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -15,7 +15,7 @@ #include "../pci.h" #include "msi.h" -int pci_msi_enable = 1; +bool pci_msi_enable = true; /** * pci_msi_supported - check whether MSI may be enabled on a device @@ -970,5 +970,5 @@ EXPORT_SYMBOL(msi_desc_to_pci_dev); void pci_no_msi(void) { - pci_msi_enable = 0; + pci_msi_enable = false; } diff --git a/drivers/pci/msi/msi.h b/drivers/pci/msi/msi.h index ee53cf0..fc70b60 100644 --- a/drivers/pci/msi/msi.h +++ b/drivers/pci/msi/msi.h @@ -87,7 +87,7 @@ static inline __attribute_const__ u32 msi_multi_mask(struct msi_desc *desc) void msix_prepare_msi_desc(struct pci_dev *dev, struct msi_desc *desc); /* Subsystem variables */ -extern int pci_msi_enable; +extern bool pci_msi_enable; /* MSI internal functions invoked from the public APIs */ void pci_msi_shutdown(struct pci_dev *dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index 0e8e3fd..f5e908a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1669,7 +1669,7 @@ void pci_disable_msi(struct pci_dev *dev); int pci_msix_vec_count(struct pci_dev *dev); void pci_disable_msix(struct pci_dev *dev); void pci_restore_msi_state(struct pci_dev *dev); -int pci_msi_enabled(void); +bool pci_msi_enabled(void); int pci_enable_msi(struct pci_dev *dev); int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries, int minvec, int maxvec); @@ -1702,7 +1702,7 @@ static inline void pci_disable_msi(struct pci_dev *dev) { } static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; } static inline void pci_disable_msix(struct pci_dev *dev) { } static inline void pci_restore_msi_state(struct pci_dev *dev) { } -static inline int pci_msi_enabled(void) { return 0; } +static inline bool pci_msi_enabled(void) { return false; } static inline int pci_enable_msi(struct pci_dev *dev) { return -ENOSYS; } static inline int pci_enable_msix_range(struct pci_dev *dev,
