Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b4486e2 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: pci: Use the new IRQF_ constants 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8c56e721

drivers/pci/hotplug/cpci_hotplug_core.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ cpci_hp_intr(int irq, void *data, struct pt_regs *regs) 
	dbg("entered cpci_hp_intr");



	/* Check to see if it was our interrupt */

	if ((controller->irq_flags & SA_SHIRQ) &&

	if ((controller->irq_flags & IRQF_SHARED) &&

	    !controller->ops->check_irq(controller->dev_id)) {

		dbg("exited cpci_hp_intr, not our interrupt");

		return IRQ_NONE;

drivers/pci/hotplug/cpcihp_zt5550.c

+3 −2
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
#include <linux/init.h>

#include <linux/errno.h>

#include <linux/pci.h>

#include <linux/signal.h>	/* SA_SHIRQ */

#include <linux/interrupt.h>

#include <linux/signal.h>	/* IRQF_SHARED */

#include "cpci_hotplug.h"

#include "cpcihp_zt5550.h"
@@ -219,7 +220,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id 
	zt5550_hpc.ops = &zt5550_hpc_ops;

	if(!poll) {

		zt5550_hpc.irq = hc_dev->irq;

		zt5550_hpc.irq_flags = SA_SHIRQ;

		zt5550_hpc.irq_flags = IRQF_SHARED;

		zt5550_hpc.dev_id = hc_dev;



		zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;

drivers/pci/hotplug/cpqphp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* set up the interrupt */

	dbg("HPC interrupt = %d \n", ctrl->interrupt);

	if (request_irq(ctrl->interrupt, cpqhp_ctrl_intr,

			SA_SHIRQ, MY_NAME, ctrl)) {

			IRQF_SHARED, MY_NAME, ctrl)) {

		err("Can't get irq %d for the hotplug pci controller\n",

			ctrl->interrupt);

		rc = -ENODEV;

drivers/pci/hotplug/pciehp_hpc.c

+1 −1
Original line number Diff line number Diff line
@@ -1458,7 +1458,7 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev) 
		start_int_poll_timer( php_ctlr, 10 );   /* start with 10 second delay */

	} else {

		/* Installs the interrupt handler */

		rc = request_irq(php_ctlr->irq, pcie_isr, SA_SHIRQ, MY_NAME, (void *) ctrl);

		rc = request_irq(php_ctlr->irq, pcie_isr, IRQF_SHARED, MY_NAME, (void *) ctrl);

		dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc);

		if (rc) {

			err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq);

drivers/pci/hotplug/shpchp_hpc.c

+1 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev) 
		} else

			php_ctlr->irq = pdev->irq;

		

		rc = request_irq(php_ctlr->irq, shpc_isr, SA_SHIRQ, MY_NAME, (void *) ctrl);

		rc = request_irq(php_ctlr->irq, shpc_isr, IRQF_SHARED, MY_NAME, (void *) ctrl);

		dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc);

		if (rc) {

			err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq);