Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[firefly-linux-kernel-4.4.55.git] / drivers / mcb / mcb-pci.c

diff --git a/drivers/mcb/mcb-pci.c b/drivers/mcb/mcb-pci.c
index 99c742cbfb5b94b65848587eee4d2c7b31ae022d..b5918196564376b028e825ccc75131ae74b1cdd0 100644 (file)
--- a/drivers/mcb/mcb-pci.c
+++ b/drivers/mcb/mcb-pci.c
@@ -20,6 +20,15 @@ struct priv {
        void __iomem *base;
 };
 
+static int mcb_pci_get_irq(struct mcb_device *mdev)
+{
+       struct mcb_bus *mbus = mdev->bus;
+       struct device *dev = mbus->carrier;
+       struct pci_dev *pdev = to_pci_dev(dev);
+
+       return pdev->irq;
+}
+
 static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        struct priv *priv;
@@ -67,7 +76,13 @@ static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        pci_set_drvdata(pdev, priv);
 
-       priv->bus = mcb_alloc_bus();
+       priv->bus = mcb_alloc_bus(&pdev->dev);
+       if (IS_ERR(priv->bus)) {
+               ret = PTR_ERR(priv->bus);
+               goto err_drvdata;
+       }
+
+       priv->bus->get_irq = mcb_pci_get_irq;
 
        ret = chameleon_parse_cells(priv->bus, mapbase, priv->base);
        if (ret < 0)