[RFC: 2.6 patch] #if 0 e1000e_read_nvm_spi()

Subsystems: networking drivers, the rest

STALE6749d

2 messages, 2 authors, 2008-03-03 · open the first message on its own page

[RFC: 2.6 patch] #if 0 e1000e_read_nvm_spi()

From: Adrian Bunk <bunk@kernel.org>
Date: 2008-03-01 16:27:52

This patch #if 0's the no longer used e1000e_read_nvm_spi().

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

 drivers/net/e1000e/e1000.h |    1 -
 drivers/net/e1000e/lib.c   |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

9bab4dc421a7e5a947739e2fa1363b4efffbcbe2 foobar
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index 327c062..6e0c6ed 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -462,7 +462,6 @@ extern s32 e1000e_acquire_nvm(struct e1000_hw *hw);
 extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);
 extern s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
-extern s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);
 extern void e1000e_release_nvm(struct e1000_hw *hw);
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 95f75a4..cb2dac8 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -1851,6 +1851,7 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
 	return 0;
 }
 
+#if 0
 /**
  *  e1000e_read_nvm_spi - Reads EEPROM using SPI
  *  @hw: pointer to the HW structure
@@ -1906,6 +1907,7 @@ s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 	nvm->ops.release_nvm(hw);
 	return 0;
 }
+#endif  /*  0  */
 
 /**
  *  e1000e_read_nvm_eerd - Reads EEPROM using EERD register


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [RFC: 2.6 patch] #if 0 e1000e_read_nvm_spi()

From: Kok, Auke <hidden>
Date: 2008-03-03 17:37:50

Adrian Bunk wrote:
This patch #if 0's the no longer used e1000e_read_nvm_spi().
OK, thanks Adrian

I'll send a patch to remove the function alltogether.

Auke

quoted hunk
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

 drivers/net/e1000e/e1000.h |    1 -
 drivers/net/e1000e/lib.c   |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

9bab4dc421a7e5a947739e2fa1363b4efffbcbe2 foobar
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index 327c062..6e0c6ed 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -462,7 +462,6 @@ extern s32 e1000e_acquire_nvm(struct e1000_hw *hw);
 extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);
 extern s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
-extern s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);
 extern void e1000e_release_nvm(struct e1000_hw *hw);
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 95f75a4..cb2dac8 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -1851,6 +1851,7 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
 	return 0;
 }
 
+#if 0
 /**
  *  e1000e_read_nvm_spi - Reads EEPROM using SPI
  *  @hw: pointer to the HW structure
@@ -1906,6 +1907,7 @@ s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 	nvm->ops.release_nvm(hw);
 	return 0;
 }
+#endif  /*  0  */
 
 /**
  *  e1000e_read_nvm_eerd - Reads EEPROM using EERD register

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help