[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Tue, 05 Apr 2011 00:21:19 +0100
From: Ben Hutchings <bhutchings@...arflare.com>
To: Stephen Hemminger <shemminger@...tta.com>
Cc: "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org
Subject: Re: [PATCH 8/8] ewrk3: convert to set_phys_id
On Mon, 2011-04-04 at 14:06 -0700, Stephen Hemminger wrote:
> Keep orginal locking and error handling.
>
> Signed-off-by: Stephen Hemminger <shemminger@...tta.com>
>
>
> --- a/drivers/net/ewrk3.c 2011-04-04 13:41:41.717791151 -0700
> +++ b/drivers/net/ewrk3.c 2011-04-04 13:46:55.425138028 -0700
> @@ -1604,55 +1604,51 @@ static u32 ewrk3_get_link(struct net_dev
> return !(cmr & CMR_LINK);
> }
>
> -static int ewrk3_phys_id(struct net_device *dev, u32 data)
> +static int ewrk3_set_phys_id(struct net_device *dev,
> + enum ethtool_phys_id_state state)
> {
> struct ewrk3_private *lp = netdev_priv(dev);
> unsigned long iobase = dev->base_addr;
> unsigned long flags;
> u8 cr;
> - int count;
> -
> - /* Toggle LED 4x per second */
> - count = data << 2;
>
> spin_lock_irqsave(&lp->hw_lock, flags);
>
> - /* Bail if a PHYS_ID is already in progress */
> - if (lp->led_mask == 0) {
> - spin_unlock_irqrestore(&lp->hw_lock, flags);
> - return -EBUSY;
> - }
> + switch (state) {
> + case ETHTOOL_ID_ACTIVE:
> + /* Bail if a PHYS_ID is already in progress */
> + if (lp->led_mask == 0) {
> + spin_unlock_irqrestore(&lp->hw_lock, flags);
> + return -EBUSY;
> + }
[...]
This can never happen. Well, actually it can with the first version of
my patch, but I'll fix that. :-)
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists