[PATCH] ahci: compile out msi/msix infrastructure

[arnd@arndb.de (Arnd Bergmann)]

On Saturday 05 December 2015 23:22:49 Arnd Bergmann wrote:
> On Friday 04 December 2015 11:58:30 Dan Williams wrote:
> > +#ifdef CONFIG_PCI_MSI
> > +static inline int ahci_irq_vector(struct ahci_host_priv *hpriv, int port)
> > +{
> > +       if (hpriv->flags & AHCI_HFLAG_MULTI_MSIX)
> > +               return hpriv->msix[i].vector;
> > +       else
> > +               return hpriv->irq + i;
> > +}
> > 
> 
> My randconfig tests now noticed that 'i' is undeclared here. I suppose it
> should be 'port' instead of 'i'?
> 

and one more:

In file included from /git/arm-soc/drivers/ata/ahci_platform.c:25:0:
/git/arm-soc/drivers/ata/ahci.h: In function 'ahci_irq_vector':
/git/arm-soc/drivers/ata/ahci.h:368:3: error: invalid use of undefined type 'struct msix_entry'
   return hpriv->msix[port].vector;
   ^
/git/arm-soc/drivers/ata/ahci.h:368:21: error: dereferencing pointer to incomplete type 'struct msix_entry'
   return hpriv->msix[port].vector;


diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index c450b8a914eb..dfbd033706bb 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -37,6 +37,7 @@
 
 #include <linux/clk.h>
 #include <linux/libata.h>
+#include <linux/pci.h>
 #include <linux/phy/phy.h>
 #include <linux/regulator/consumer.h>