lkml.org 
[lkml]   [2007]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] lib82596, netxen: delete pointless tests from irq handler

    commit e96888518af94d9f607b996f8b90873330dbfc32
    Author: Jeff Garzik <jeff@garzik.org>
    Date: Fri Oct 19 03:14:03 2007 -0400

    [NETDRVR] lib82596, netxen: delete pointless tests from irq handler

    Remove always-false tests in irq handler.

    Also a few other minor cleanups.

    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

    drivers/net/lib82596.c | 8 +-------
    drivers/net/netxen/netxen_nic_main.c | 11 ++---------
    2 files changed, 3 insertions(+), 16 deletions(-)

    e96888518af94d9f607b996f8b90873330dbfc32
    diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
    index ffaa14f..9a855e5 100644
    --- a/drivers/net/lib82596.c
    +++ b/drivers/net/lib82596.c
    @@ -1124,12 +1124,6 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id)
    struct i596_dma *dma;
    unsigned short status, ack_cmd = 0;

    - if (dev == NULL) {
    - printk(KERN_WARNING "%s: irq %d for unknown device.\n",
    - __FUNCTION__, irq);
    - return IRQ_NONE;
    - }
    -
    lp = netdev_priv(dev);
    dma = lp->dma;

    @@ -1140,7 +1134,7 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id)

    DEB(DEB_INTS, printk(KERN_DEBUG
    "%s: i596 interrupt, IRQ %d, status %4.4x.\n",
    - dev->name, irq, status));
    + dev->name, dev->irq, status));

    ack_cmd = status & 0xf000;

    diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
    index 601051c..a80f0cd 100644
    --- a/drivers/net/netxen/netxen_nic_main.c
    +++ b/drivers/net/netxen/netxen_nic_main.c
    @@ -1268,17 +1268,10 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
    */
    irqreturn_t netxen_intr(int irq, void *data)
    {
    - struct netxen_adapter *adapter;
    - struct net_device *netdev;
    + struct netxen_adapter *adapter = data;
    + struct net_device *netdev = adapter->netdev;
    u32 our_int = 0;

    - if (unlikely(!irq)) {
    - return IRQ_NONE; /* Not our interrupt */
    - }
    -
    - adapter = (struct netxen_adapter *)data;
    - netdev = adapter->netdev;
    -
    if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
    our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
    /* not our interrupt */
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-10-19 09:49    [W:0.021 / U:60.444 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site