| Message ID | 20161108134937.1966206-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 11/8/2016 8:48 AM, Arnd Bergmann wrote: > The newly added MSI support causes a harmless warning when MSI > is disabled: > > drivers/dma/qcom/hidma.c:558:20: error: 'hidma_chirq_handler_msi' defined but not used [-Werror=unused-function] > > This adds another #ifdef to match that around the users of the function. > > Fixes: 1c0e3e82a7fb ("dmaengine: qcom_hidma: add MSI support for interrupts") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks for the clean up. Acked-by: Sinan Kaya <okaya@codeaurora.org> > --- > drivers/dma/qcom/hidma.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c > index d5e7991ad737..10425e134e06 100644 > --- a/drivers/dma/qcom/hidma.c > +++ b/drivers/dma/qcom/hidma.c > @@ -555,6 +555,7 @@ static irqreturn_t hidma_chirq_handler(int chirq, void *arg) > return hidma_ll_inthandler(chirq, lldev); > } > > +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN > static irqreturn_t hidma_chirq_handler_msi(int chirq, void *arg) > { > struct hidma_lldev **lldevp = arg; > @@ -563,6 +564,7 @@ static irqreturn_t hidma_chirq_handler_msi(int chirq, void *arg) > return hidma_ll_inthandler_msi(chirq, *lldevp, > 1 << (chirq - dmadev->msi_virqbase)); > } > +#endif > > static ssize_t hidma_show_values(struct device *dev, > struct device_attribute *attr, char *buf) >
On Tue, Nov 08, 2016 at 02:48:59PM +0100, Arnd Bergmann wrote: > The newly added MSI support causes a harmless warning when MSI > is disabled: > > drivers/dma/qcom/hidma.c:558:20: error: 'hidma_chirq_handler_msi' defined but not used [-Werror=unused-function] > > This adds another #ifdef to match that around the users of the function. Applied, thanks
diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c index d5e7991ad737..10425e134e06 100644 --- a/drivers/dma/qcom/hidma.c +++ b/drivers/dma/qcom/hidma.c @@ -555,6 +555,7 @@ static irqreturn_t hidma_chirq_handler(int chirq, void *arg) return hidma_ll_inthandler(chirq, lldev); } +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN static irqreturn_t hidma_chirq_handler_msi(int chirq, void *arg) { struct hidma_lldev **lldevp = arg; @@ -563,6 +564,7 @@ static irqreturn_t hidma_chirq_handler_msi(int chirq, void *arg) return hidma_ll_inthandler_msi(chirq, *lldevp, 1 << (chirq - dmadev->msi_virqbase)); } +#endif static ssize_t hidma_show_values(struct device *dev, struct device_attribute *attr, char *buf)
The newly added MSI support causes a harmless warning when MSI is disabled: drivers/dma/qcom/hidma.c:558:20: error: 'hidma_chirq_handler_msi' defined but not used [-Werror=unused-function] This adds another #ifdef to match that around the users of the function. Fixes: 1c0e3e82a7fb ("dmaengine: qcom_hidma: add MSI support for interrupts") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/dma/qcom/hidma.c | 2 ++ 1 file changed, 2 insertions(+)