* [RFC: 2.6 patch] #if 0 e1000e_read_nvm_spi()
@ 2008-03-01 16:23 Adrian Bunk
2008-03-03 17:24 ` Kok, Auke
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2008-03-01 16:23 UTC (permalink / raw)
To: Auke Kok, Jeff Kirsher, Jeff Garzik, jesse.brandeburg, john.ronciak
Cc: e1000-devel, linux-kernel, netdev
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [RFC: 2.6 patch] #if 0 e1000e_read_nvm_spi()
2008-03-01 16:23 [RFC: 2.6 patch] #if 0 e1000e_read_nvm_spi() Adrian Bunk
@ 2008-03-03 17:24 ` Kok, Auke
0 siblings, 0 replies; 2+ messages in thread
From: Kok, Auke @ 2008-03-03 17:24 UTC (permalink / raw)
To: Adrian Bunk
Cc: Jeff Kirsher, Jeff Garzik, jesse.brandeburg, john.ronciak,
e1000-devel, linux-kernel, netdev
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
>
> 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-03-03 17:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-01 16:23 [RFC: 2.6 patch] #if 0 e1000e_read_nvm_spi() Adrian Bunk
2008-03-03 17:24 ` Kok, Auke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).