From: Andrzej Krzysztofowicz <ankry@green.mif.pg.gda.pl>
To: alan@lxorguk.ukuu.org.uk (Alan Cox),
jgarzik@mandrakesoft.com (Jeff Garzik),
Philip.Blundell@pobox.com
Cc: linux-kernel@vger.kernel.org (kernel list)
Subject: [PATCH] net #6
Date: Wed, 30 May 2001 02:44:03 +0200 (CEST) [thread overview]
Message-ID: <200105300044.CAA04542@green.mif.pg.gda.pl> (raw)
The following patch removes unnecessary #ifdefs from eexpress.c
Andrzej
************************** PATCH 6 *******************************
diff -uNr linux-2.4.5-ac4/drivers/net/eexpress.c linux/drivers/net/eexpress.c
--- linux-2.4.5-ac4/drivers/net/eexpress.c Wed May 30 01:08:54 2001
+++ linux/drivers/net/eexpress.c Wed May 30 01:13:49 2001
@@ -574,9 +574,7 @@
static void eexp_timeout(struct net_device *dev)
{
struct net_local *lp = (struct net_local *)dev->priv;
-#ifdef CONFIG_SMP
- unsigned long flags;
-#endif
+ unsigned long __attribute__((unused)) flags;
int status;
disable_irq(dev->irq);
@@ -586,10 +584,7 @@
* lets make it work first..
*/
-#ifdef CONFIG_SMP
spin_lock_irqsave(&lp->lock, flags);
-#endif
-
status = scb_status(dev);
unstick_cu(dev);
printk(KERN_INFO "%s: transmit timed out, %s?\n", dev->name,
@@ -602,9 +597,7 @@
outb(0,dev->base_addr+SIGNAL_CA);
}
netif_wake_queue(dev);
-#ifdef CONFIG_SMP
spin_unlock_irqrestore(&lp->lock, flags);
-#endif
}
/*
@@ -614,9 +607,7 @@
static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)
{
struct net_local *lp = (struct net_local *)dev->priv;
-#ifdef CONFIG_SMP
- unsigned long flags;
-#endif
+ unsigned long __attribute__((unused)) flags;
#if NET_DEBUG > 6
printk(KERN_DEBUG "%s: eexp_xmit()\n", dev->name);
@@ -629,10 +620,7 @@
* lets make it work first..
*/
-#ifdef CONFIG_SMP
spin_lock_irqsave(&lp->lock, flags);
-#endif
-
{
unsigned short length = (ETH_ZLEN < buf->len) ? buf->len :
ETH_ZLEN;
@@ -643,9 +631,7 @@
eexp_hw_tx_pio(dev,data,length);
}
dev_kfree_skb(buf);
-#ifdef CONFIG_SMP
spin_unlock_irqrestore(&lp->lock, flags);
-#endif
enable_irq(dev->irq);
return 0;
}
--
=======================================================================
Andrzej M. Krzysztofowicz ankry@mif.pg.gda.pl
phone (48)(58) 347 14 61
Faculty of Applied Phys. & Math., Technical University of Gdansk
next reply other threads:[~2001-05-30 0:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-05-30 0:44 Andrzej Krzysztofowicz [this message]
2001-05-30 8:01 ` [PATCH] net #6 Alan Cox
2001-05-30 10:35 ` Andrzej Krzysztofowicz
2001-05-30 22:24 ` Pavel Machek
2001-05-31 21:35 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200105300044.CAA04542@green.mif.pg.gda.pl \
--to=ankry@green.mif.pg.gda.pl \
--cc=Philip.Blundell@pobox.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=jgarzik@mandrakesoft.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.