Re: [1/4 v2] Remove unused zero-copy code from velocity NIC driver.

[Dave Jones <davej@redhat.com>]

On Thu, Jul 23, 2009 at 03:58:55PM -0700, David Miller wrote:
 > From: David Miller <davem@davemloft.net>
 > Date: Tue, 21 Jul 2009 12:33:22 -0700 (PDT)
 > 
 > > Ok, all applied to net-next-2.6, thanks.
 > 
 > Ok, now we have a stinking pile of poo situation when one tries to
 > compile the velocity driver without CONFIG_PM defined.
 > 
 > First we hit:
 > 
 > drivers/net/via-velocity.c: In function ‘velocity_init_module’:
 > drivers/net/via-velocity.c:3303: error: implicit declaration of function ‘velocity_register_notifier’
 > drivers/net/via-velocity.c:3306: error: implicit declaration of function ‘velocity_unregister_notifier’
 > 
 > Because the whole CONFIG_PM + CONFIG_INET ifdeffery around these functions
 > was missed up.  Simple enough to fix, but then we get:
 > 
 > drivers/net/via-velocity.c:2957: warning: ‘velocity_suspend’ defined but not used
 > drivers/net/via-velocity.c:3026: warning: ‘velocity_resume’ defined but not used
 > 
 > Fine, let's ifdef protect these two functions with CONFIG_PM:
 > 
 > drivers/net/via-velocity.c:2853: warning: ‘velocity_set_wol’ defined but not used
 > drivers/net/via-velocity.c:2939: warning: ‘velocity_save_context’ defined but not used
 > drivers/net/via-velocity.c:3001: warning: ‘velocity_restore_context’ defined but not used
 > 
 > And at this point I really give up Dave.  This whole thing to move
 > functions around to avoid forward decls has created a worse problem
 > than it solved.
 > 
 > Unless you can fix this, like, immediately.  I want to revert.
 > 
 > This is keeping me from pulling more work into my net-next-2.6
 > tree.

apologies.. This should fix it..

	Dave

-- 

Previous changes broke compilation with CONFIG_PM disabled.
This widens the ifdefs to cover the functions that only get called
within the suspend/resume routines.

Signed-off-by: Dave Jones <davej@redhat.com>

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index b4bd1d3..47be41a 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2805,6 +2805,7 @@ err_free_dev:
 }
 
 
+#ifdef CONFIG_PM
 /**
  *	wol_calc_crc		-	WOL CRC
  *	@pattern: data pattern
@@ -2952,7 +2953,6 @@ static void velocity_save_context(struct velocity_info *vptr, struct velocity_co
 
 }
 
-
 static int velocity_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
@@ -3056,7 +3056,7 @@ static int velocity_resume(struct pci_dev *pdev)
 
 	return 0;
 }
-
+#endif
 
 /*
  *	Definition for our device driver. The PCI layer interface
@@ -3239,7 +3239,6 @@ static const struct ethtool_ops velocity_ethtool_ops = {
 };
 
 #ifdef CONFIG_PM
-
 #ifdef CONFIG_INET
 static int velocity_netdev_event(struct notifier_block *nb, unsigned long notification, void *ptr)
 {
@@ -3263,6 +3262,7 @@ static int velocity_netdev_event(struct notifier_block *nb, unsigned long notifi
 	return NOTIFY_DONE;
 }
 #endif	/* CONFIG_INET */
+#endif	/* CONFIG_PM */
 
 #if defined(CONFIG_PM) && defined(CONFIG_INET)
 static struct notifier_block velocity_inetaddr_notifier = {
@@ -3286,8 +3286,6 @@ static void velocity_unregister_notifier(void)
 
 #endif	/* defined(CONFIG_PM) && defined(CONFIG_INET) */
 
-#endif	/* CONFIG_PM */
-
 /**
  *	velocity_init_module	-	load time function
  *