From patchwork Tue Jan 26 19:17:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Dobriyan X-Patchwork-Id: 43722 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45D35B7D25 for ; Wed, 27 Jan 2010 06:18:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755018Ab0AZTRm (ORCPT ); Tue, 26 Jan 2010 14:17:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754997Ab0AZTRl (ORCPT ); Tue, 26 Jan 2010 14:17:41 -0500 Received: from mail-ew0-f219.google.com ([209.85.219.219]:50404 "EHLO mail-ew0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754992Ab0AZTRk (ORCPT ); Tue, 26 Jan 2010 14:17:40 -0500 Received: by ewy19 with SMTP id 19so1353546ewy.21 for ; Tue, 26 Jan 2010 11:17:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=fJdfaxI/0GWYtsGSH35S7ofT/6DeQZHo3glHginjumo=; b=RVEb2YohPgDKp+KskFDIGZJnWC/9Ou8H3QvDDmhWBXTMeEn60z1zd2/LfuJSH1Yln0 BfVjU5lveGGWeiZrNeoiolwu6exdx0CkYLuERXfMLDYEWUOB7Sh9KoGbeG4AUyTF/KpO f7aoGEi0Dk3nAw6SSR2O+NpQiWxclx52fYGN4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=IYQT4zVfdLgqfyOyX9bqnROdsJ0Qz7wf7MskL7OTzfdRaZwKBMS1RmzsuY0JHRQVUS 2e6R0LcFP+aKqJ97VR1QUt8hP0v/voQm0C6yyK/rAk1PCzwsfM3DaNBvl71UF5eWENrd 0MlHuxO4yF6Qn4edN/9i+NMM4poOAamwhlqhY= Received: by 10.213.1.22 with SMTP id 22mr1309324ebd.92.1264533454291; Tue, 26 Jan 2010 11:17:34 -0800 (PST) Received: from x200 ([93.84.104.183]) by mx.google.com with ESMTPS id 23sm10710732eya.3.2010.01.26.11.17.31 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 26 Jan 2010 11:17:33 -0800 (PST) Date: Tue, 26 Jan 2010 21:17:27 +0200 From: Alexey Dobriyan To: David Miller Cc: geert@linux-m68k.org, linux-next@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netdev: remove HAVE_ leftovers Message-ID: <20100126191727.GA5454@x200> References: <10f740e81001260057h37f3494dvefa3a37b2e1453a5@mail.gmail.com> <20100126.051817.215651254.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100126.051817.215651254.davem@davemloft.net> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Jan 26, 2010 at 05:18:17AM -0800, David Miller wrote: > Alexey, please go through at least drivers/net and look at the > other stale references to these HAVE_* macros. My apologies. [PATCH] netdev: remove HAVE_ leftovers Signed-off-by: Alexey Dobriyan --- drivers/net/cassini.c | 2 +- drivers/net/meth.c | 3 --- drivers/staging/wlags49_h2/wl_netdev.c | 6 ------ 3 files changed, 1 insertion(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c @@ -106,7 +106,7 @@ #define cas_page_unmap(x) kunmap_atomic((x), KM_SKB_DATA_SOFTIRQ) #define CAS_NCPUS num_online_cpus() -#if defined(CONFIG_CASSINI_NAPI) && defined(HAVE_NETDEV_POLL) +#ifdef CONFIG_CASSINI_NAPI #define USE_NAPI #define cas_skb_release(x) netif_receive_skb(x) #else --- a/drivers/net/meth.c +++ b/drivers/net/meth.c @@ -51,14 +51,11 @@ static const char *meth_str="SGI O2 Fast Ethernet"; -#define HAVE_TX_TIMEOUT /* The maximum time waited (in jiffies) before assuming a Tx failed. (400ms) */ #define TX_TIMEOUT (400*HZ/1000) -#ifdef HAVE_TX_TIMEOUT static int timeout = TX_TIMEOUT; module_param(timeout, int, 0); -#endif /* * This structure is private to each device. It is used to pass --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c @@ -1194,9 +1194,7 @@ static const struct net_device_ops wl_netdev_ops = .ndo_stop = &wl_adapter_close, .ndo_do_ioctl = &wl_ioctl, -#ifdef HAVE_TX_TIMEOUT .ndo_tx_timeout = &wl_tx_timeout, -#endif #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = wl_poll, @@ -1270,9 +1268,7 @@ struct net_device * wl_device_alloc( void ) dev->stop = &wl_adapter_close; dev->do_ioctl = &wl_ioctl; -#ifdef HAVE_TX_TIMEOUT dev->tx_timeout = &wl_tx_timeout; -#endif #ifdef CONFIG_NET_POLL_CONTROLLER dev->poll_controller = wl_poll; @@ -1280,9 +1276,7 @@ struct net_device * wl_device_alloc( void ) #endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) -#ifdef HAVE_TX_TIMEOUT dev->watchdog_timeo = TX_TIMEOUT; -#endif dev->ethtool_ops = &wl_ethtool_ops;