Thread (29 messages) 29 messages, 7 authors, 2012-01-11

Re: [PATCH net-next v2 2/4] can: cc770: add legacy ISA bus driver for the CC770 and AN82527

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2012-01-11 09:39:04
Also in: netdev

Possibly related (same subject, not in this thread)

Hello,

On 01/11/2012 10:00 AM, Wolfgang Zarre wrote:
quoted
quoted
Please provide an extra patch for these unrelated changes. If we really
want to remove it.
Sure, this I can do.
Ok, here the patch to remove:
Looks good, please add a patch description and put in a patch series
together with the spinlock patch (see other mail).

Marc
quoted hunk ↗ jump to hunk
--------------------------------------------------------
diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c
index 2d12f89..dad6707 100644
--- a/drivers/net/can/cc770/cc770.c
+++ b/drivers/net/can/cc770/cc770.c
@@ -460,15 +460,6 @@ static netdev_tx_t cc770_start_xmit(struct sk_buff
*skb, struct net_device *dev)

     stats->tx_bytes += dlc;

-
-    /*
-     * HM: We had some cases of repeated IRQs so make sure the
-     * INT is acknowledged I know it's already further up, but
-     * doing again fixed the issue
-     */
-    cc770_write_reg(priv, msgobj[mo].ctrl0,
-            MSGVAL_UNC | TXIE_UNC | RXIE_UNC | INTPND_RES);
-
     return NETDEV_TX_OK;
 }
@@ -689,12 +680,6 @@ static void cc770_tx_interrupt(struct net_device
*dev, unsigned int o)
     /* Nothing more to send, switch off interrupts */
     cc770_write_reg(priv, msgobj[mo].ctrl0,
             MSGVAL_RES | TXIE_RES | RXIE_RES | INTPND_RES);
-    /*
-     * We had some cases of repeated IRQ so make sure the
-     * INT is acknowledged
-     */
-    cc770_write_reg(priv, msgobj[mo].ctrl0,
-            MSGVAL_UNC | TXIE_UNC | RXIE_UNC | INTPND_RES);

     stats->tx_packets++;
     can_get_echo_skb(dev, 0);
----------------------------------------------------------
Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help