summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-01-01 05:22:46 +0000
committerDavid S. Miller <davem@davemloft.net>2011-01-01 13:51:21 -0800
commitaa6027cacdd912ce884953714fcc7392b6155bc6 (patch)
treeaf5eb4cbcd0a14d19dd08f829d1db57990441b45
parent7dbf6acdbad2fbc6eea72b58404461dcb7c6d9d2 (diff)
downloadlinux-3.10-aa6027cacdd912ce884953714fcc7392b6155bc6.tar.gz
linux-3.10-aa6027cacdd912ce884953714fcc7392b6155bc6.tar.bz2
linux-3.10-aa6027cacdd912ce884953714fcc7392b6155bc6.zip
tg3: fix warnings
In case CONFIG_PM_SLEEP is disabled, we dont need tg3_suspend() and tg3_resume(). drivers/net/tg3.c:15056: warning: ‘tg3_suspend’ defined but not used drivers/net/tg3.c:15110: warning: ‘tg3_resume’ defined but not used Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Michael Chan <mchan@broadcom.com> Cc: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tg3.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 6137869799a..e3d80c9fb86 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -15052,6 +15052,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev)
}
}
+#ifdef CONFIG_PM_SLEEP
static int tg3_suspend(struct device *device)
{
struct pci_dev *pdev = to_pci_dev(device);
@@ -15140,13 +15141,20 @@ out:
}
static SIMPLE_DEV_PM_OPS(tg3_pm_ops, tg3_suspend, tg3_resume);
+#define TG3_PM_OPS (&tg3_pm_ops)
+
+#else
+
+#define TG3_PM_OPS NULL
+
+#endif /* CONFIG_PM_SLEEP */
static struct pci_driver tg3_driver = {
.name = DRV_MODULE_NAME,
.id_table = tg3_pci_tbl,
.probe = tg3_init_one,
.remove = __devexit_p(tg3_remove_one),
- .driver.pm = &tg3_pm_ops,
+ .driver.pm = TG3_PM_OPS,
};
static int __init tg3_init(void)