From: Arnd Bergmann Date: Tue, 13 Mar 2018 13:06:03 +0000 (-0400) Subject: media: ngene: avoid unused variable warning X-Git-Tag: v4.17-rc1~143^2~65 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=492b183bd7bcaede57381f4d06e19f1983083781;p=linux.git media: ngene: avoid unused variable warning The newly added pdev variable is only used in an #ifdef, causing a build warning without CONFIG_PCI_MSI, unless we move the declaration inside the same #ifdef: drivers/media/pci/ngene/ngene-core.c: In function 'ngene_start': drivers/media/pci/ngene/ngene-core.c:1328:17: error: unused variable 'pdev' [-Werror=unused-variable] Fixes: 6795bf626482 ("media: ngene: convert kernellog printing from printk() to dev_*() macros") Signed-off-by: Arnd Bergmann Acked-by: Daniel Scheller Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c index 3b9a1bfaf6c0..25f16833a475 100644 --- a/drivers/media/pci/ngene/ngene-core.c +++ b/drivers/media/pci/ngene/ngene-core.c @@ -1325,7 +1325,6 @@ static int ngene_buffer_config(struct ngene *dev) static int ngene_start(struct ngene *dev) { - struct device *pdev = &dev->pci_dev->dev; int stat; int i; @@ -1359,6 +1358,7 @@ static int ngene_start(struct ngene *dev) #ifdef CONFIG_PCI_MSI /* enable MSI if kernel and card support it */ if (pci_msi_enabled() && dev->card_info->msi_supported) { + struct device *pdev = &dev->pci_dev->dev; unsigned long flags; ngwritel(0, NGENE_INT_ENABLE);