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

Commit 59b47ddc authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: htirq: Use irq_alloc/free_irq() 



No functional change, just cleaned up a bit.

This does not replace the requirement to move x86 to irq domains, but
it limits the mess to some degree.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: x86@kernel.org
Cc: linux-pci@vger.kernel.org
Link: http://lkml.kernel.org/r/20140507154335.452206351@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 0a2db49d

drivers/pci/htirq.c

+4 −9
Original line number Diff line number Diff line
@@ -87,12 +87,9 @@ void unmask_ht_irq(struct irq_data *data) 
int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)

{

	struct ht_irq_cfg *cfg;

	int max_irq, pos, irq;

	unsigned long flags;

	u32 data;

	int max_irq;

	int pos;

	int irq;

	int node;



	pos = pci_find_ht_capability(dev, HT_CAPTYPE_IRQ);

	if (!pos)
@@ -120,10 +117,8 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update) 
	cfg->msg.address_lo = 0xffffffff;

	cfg->msg.address_hi = 0xffffffff;



	node = dev_to_node(&dev->dev);

	irq = create_irq_nr(0, node);



	if (irq <= 0) {

	irq = irq_alloc_hwirq(dev_to_node(&dev->dev));

	if (!irq) {

		kfree(cfg);

		return -EBUSY;

	}
@@ -166,7 +161,7 @@ void ht_destroy_irq(unsigned int irq) 
	cfg = irq_get_handler_data(irq);

	irq_set_chip(irq, NULL);

	irq_set_handler_data(irq, NULL);

	destroy_irq(irq);

	irq_free_hwirq(irq);



	kfree(cfg);

}