| Message ID | 20180313130620.4040088-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 492b183bd7bcaede57381f4d06e19f1983083781 |
| Headers | show |
| Series | media: ngene: avoid unused variable warning | expand |
Am Tue, 13 Mar 2018 14:06:03 +0100 schrieb Arnd Bergmann <arnd@arndb.de>: > 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 <arnd@arndb.de> Acked-by: Daniel Scheller <d.scheller@gmx.net> Thanks! > --- > drivers/media/pci/ngene/ngene-core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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); Best regards, Daniel Scheller -- https://github.com/herrnst
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);
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 <arnd@arndb.de> --- drivers/media/pci/ngene/ngene-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0