From 577d8361f68aff79eb485ce2eef6b1d2ccb335cd Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 9 Jan 2012 19:41:48 +0000
Subject: [PATCH] --- yaml --- r: 289806 b: refs/heads/master c:
 b249513e8ba3ca8bc2c87e78eb6e302d5d8abd6f h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/ethernet/sfc/net_driver.h | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4cc10527738e..47f7a1412992 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94813b86bf1981338de0a6e2ab50be3b4366f3bd
+refs/heads/master: b249513e8ba3ca8bc2c87e78eb6e302d5d8abd6f
diff --git a/trunk/drivers/net/ethernet/sfc/net_driver.h b/trunk/drivers/net/ethernet/sfc/net_driver.h
index a4cf8cb8180c..310c50f06458 100644
--- a/trunk/drivers/net/ethernet/sfc/net_driver.h
+++ b/trunk/drivers/net/ethernet/sfc/net_driver.h
@@ -791,15 +791,6 @@ static inline int efx_dev_registered(struct efx_nic *efx)
 	return efx->net_dev->reg_state == NETREG_REGISTERED;
 }
 
-/* Net device name, for inclusion in log messages if it has been registered.
- * Use efx->name not efx->net_dev->name so that races with (un)registration
- * are harmless.
- */
-static inline const char *efx_dev_name(struct efx_nic *efx)
-{
-	return efx_dev_registered(efx) ? efx->name : "";
-}
-
 static inline unsigned int efx_port_num(struct efx_nic *efx)
 {
 	return efx->net_dev->dev_id;