Re: [RFC PATCH] move tg3 to pci_request_irq

Arjan van de Ven
2006-10-03T07:19:43Z

On Mon, 2006-10-02 at 20:11 +0000, Frederik Deweerdt wrote:
> Hi,
>
> This proof-of-concept patch converts the tg3 driver to use the
> pci_request_irq() function.
>
> Regards,
> Frederik
>
>
> diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
> index c25ba27..23660c6 100644
> --- a/drivers/net/tg3.c
> +++ b/drivers/net/tg3.c
> @@ -6838,9 +6838,9 @@ restart_timer:
>
> static int tg3_request_irq(struct tg3 *tp)
> {
> + struct net_device *dev = tp->dev;
> irqreturn_t (*fn)(int, void *, struct pt_regs *);
> unsigned long flags;
> - struct net_device *dev = tp->dev;
>
> if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) {
> fn = tg3_msi;
> @@ -6853,7 +6853,7 @@ static int tg3_request_irq(struct tg3 *t
> fn = tg3_interrupt_tagged;
> flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM;
> }
> - return (request_irq(tp->pdev->irq, fn, flags, dev->name, dev));
> + return pci_request_irq(tp->pdev, fn, flags, dev->name);

since pci_request_irq sets IRQF_SHARED... might as well drop that above.