Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / ntb / msi.c

diff --git a/drivers/ntb/msi.c b/drivers/ntb/msi.c
index 0a5e884..3f05cfb 100644 (file)
--- a/drivers/ntb/msi.c
+++ b/drivers/ntb/msi.c
@@ -282,15 +282,13 @@ int ntbm_msi_request_threaded_irq(struct ntb_dev *ntb, irq_handler_t handler,
                                  struct ntb_msi_desc *msi_desc)
 {
        struct msi_desc *entry;
-       struct irq_desc *desc;
        int ret;
 
        if (!ntb->msi)
                return -EINVAL;
 
        for_each_pci_msi_entry(entry, ntb->pdev) {
-               desc = irq_to_desc(entry->irq);
-               if (desc->action)
+               if (irq_has_action(entry->irq))
                        continue;
 
                ret = devm_request_threaded_irq(&ntb->dev, entry->irq, handler,