[PATCH] PCI/IOV: fix building without CONFIG_PCI_IOV

[PATCH] PCI/IOV: fix building without CONFIG_PCI_IOV

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The newly added code dealing with virtual functions causes
a harmless build warning:

drivers/pci/probe.c: In function 'pci_class':
drivers/pci/probe.c:1902:12: error: unused variable 'rev' [-Werror=unused-variable]

Move the unused variable into the #ifdef block that uses it.

Fixes: 8a2a9fa37b81 ("PCI/IOV: Read VF config values that need not match PF")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/pci/probe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 833ce364f880..1ff07c592857 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1899,9 +1899,9 @@ int pci_cfg_space_size(struct pci_dev *dev)
 static u32 pci_class(struct pci_dev *dev)
 {
 	u32 class;
+#ifdef CONFIG_PCI_IOV
 	u8 rev;
 
-#ifdef CONFIG_PCI_IOV
 	if (dev->is_virtfn) {
 		if (pci_read_config_byte(dev, PCI_REVISION_ID, &rev))
 			rev = 0;
-- 
2.53.0

Re: [PATCH] PCI/IOV: fix building without CONFIG_PCI_IOV

[sashiko-bot]

> From: Arnd Bergmann <arnd@arndb.de>
> 
> The newly added code dealing with virtual functions causes
> a harmless build warning:
> 
> drivers/pci/probe.c: In function 'pci_class':
> drivers/pci/probe.c:1902:12: error: unused variable 'rev' [-Werror=unused-variable]
> 
> Move the unused variable into the #ifdef block that uses it.
> 
> Fixes: 8a2a9fa37b81 ("PCI/IOV: Read VF config values that need not match PF")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Sashiko has reviewed this patch and found no issues. It looks great!

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260928161811.2846627-1-arnd@kernel.org?part=1

Re: [PATCH] PCI/IOV: fix building without CONFIG_PCI_IOV

[Bjorn Helgaas]

On Mon, Sep 28, 2026 at 06:16:39PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The newly added code dealing with virtual functions causes
> a harmless build warning:
> 
> drivers/pci/probe.c: In function 'pci_class':
> drivers/pci/probe.c:1902:12: error: unused variable 'rev' [-Werror=unused-variable]
> 
> Move the unused variable into the #ifdef block that uses it.
> 
> Fixes: 8a2a9fa37b81 ("PCI/IOV: Read VF config values that need not match PF")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks, I fixed this similarly:

https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?h=virtualization

   #ifdef CONFIG_PCI_IOV
  -	if (dev->is_virtfn)
  -		return dev->physfn->sriov->class;
  +	if (dev->is_virtfn) {
  +		u8 rev;
  +
  +		if (pci_read_config_byte(dev, PCI_REVISION_ID, &rev))
  +			rev = 0;
  +		return (dev->physfn->class << 8) | rev;
  +	}
   #endif

> ---
>  drivers/pci/probe.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index 833ce364f880..1ff07c592857 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -1899,9 +1899,9 @@ int pci_cfg_space_size(struct pci_dev *dev)
>  static u32 pci_class(struct pci_dev *dev)
>  {
>  	u32 class;
> +#ifdef CONFIG_PCI_IOV
>  	u8 rev;
>  
> -#ifdef CONFIG_PCI_IOV
>  	if (dev->is_virtfn) {
>  		if (pci_read_config_byte(dev, PCI_REVISION_ID, &rev))
>  			rev = 0;
> -- 
> 2.53.0
>