[PATCH] bna: bnad_udelay macro cleanup

[PATCH] bna: bnad_udelay macro cleanup

[Rasesh Mody]

Change details:
	- Removed unnecessary bnad_udelay macro for ia64

Signed-off-by: Debashis Dutt <ddutt@brocade.com>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
---
 drivers/net/bna/bnad.c |    4 ++--
 drivers/net/bna/bnad.h |    6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c
index 277dbe0..12d1d7a 100644
--- a/drivers/net/bna/bnad.c
+++ b/drivers/net/bna/bnad.c
@@ -925,7 +925,7 @@ bnad_cb_tx_cleanup(struct bnad *bnad, struct bna_tcb *tcb)
 {
 	/* Delay only once for the whole Tx Path Shutdown */
 	if (!test_and_set_bit(BNAD_RF_TX_SHUTDOWN_DELAYED, &bnad->run_flags))
-		bnad_udelay(BNAD_TXRX_SYNC_UDELAY);
+		udelay(BNAD_TXRX_SYNC_UDELAY);
 }
 
 static void
@@ -938,7 +938,7 @@ bnad_cb_rx_cleanup(struct bnad *bnad,
 		clear_bit(BNAD_RXQ_STARTED, &ccb->rcb[1]->flags);
 
 	if (!test_and_set_bit(BNAD_RF_RX_SHUTDOWN_DELAYED, &bnad->run_flags))
-		bnad_udelay(BNAD_TXRX_SYNC_UDELAY);
+		udelay(BNAD_TXRX_SYNC_UDELAY);
 }
 
 static void
diff --git a/drivers/net/bna/bnad.h b/drivers/net/bna/bnad.h
index 24fd983..8b1d515 100644
--- a/drivers/net/bna/bnad.h
+++ b/drivers/net/bna/bnad.h
@@ -336,10 +336,4 @@ extern void bnad_netdev_hwstats_fill(struct bnad *bnad,
 	(((_bnad)->cfg_flags & BNAD_CF_DIM_ENABLED) && 		\
 	(test_bit(BNAD_RF_DIM_TIMER_RUNNING, &((_bnad)->run_flags))))
 
-#if defined(__ia64__)
-#define bnad_udelay	udelay
-#else
-#define bnad_udelay	__udelay
-#endif
-
 #endif /* __BNAD_H__ */
-- 
1.7.1

Re: [PATCH] bna: bnad_udelay macro cleanup

[David Miller]

From: Rasesh Mody <rmody@brocade.com>
Date: Wed, 22 Dec 2010 23:05:49 -0800

> Change details:
> 	- Removed unnecessary bnad_udelay macro for ia64
> 
> Signed-off-by: Debashis Dutt <ddutt@brocade.com>
> Signed-off-by: Rasesh Mody <rmody@brocade.com>

Please don't do it this way.

We don't add known crap, then add a patch to remove the crap.

Respin your BNA patch series so that this IA64 stuff never shows
up in the first place.

Thanks.

RE: [PATCH] bna: bnad_udelay macro cleanup

[Rasesh Mody]

>From: David Miller [mailto:davem@davemloft.net]
>Sent: Thursday, December 23, 2010 9:38 AM
>
>From: Rasesh Mody <rmody@brocade.com>
>Date: Wed, 22 Dec 2010 23:05:49 -0800
>
>> Change details:
>> 	- Removed unnecessary bnad_udelay macro for ia64
>>
>> Signed-off-by: Debashis Dutt <ddutt@brocade.com>
>> Signed-off-by: Rasesh Mody <rmody@brocade.com>
>
>Please don't do it this way.
>
>We don't add known crap, then add a patch to remove the crap.
>
>Respin your BNA patch series so that this IA64 stuff never shows
>up in the first place.
>
>Thanks.

We'll respin and resubmit the patches with ia64 macro removed as
per your suggestion. In future we'll take care to avoid this.

--Rasesh