aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/cxgb3')
-rw-r--r--drivers/net/cxgb3/common.h5
-rw-r--r--drivers/net/cxgb3/t3_hw.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 579bee42a5cb..8e8ebd788537 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -686,8 +686,9 @@ int t3_seeprom_write(struct adapter *adapter, u32 addr, __le32 data);
686int t3_seeprom_wp(struct adapter *adapter, int enable); 686int t3_seeprom_wp(struct adapter *adapter, int enable);
687int t3_get_tp_version(struct adapter *adapter, u32 *vers); 687int t3_get_tp_version(struct adapter *adapter, u32 *vers);
688int t3_check_tpsram_version(struct adapter *adapter, int *must_load); 688int t3_check_tpsram_version(struct adapter *adapter, int *must_load);
689int t3_check_tpsram(struct adapter *adapter, u8 *tp_ram, unsigned int size); 689int t3_check_tpsram(struct adapter *adapter, const u8 *tp_ram,
690int t3_set_proto_sram(struct adapter *adap, u8 *data); 690 unsigned int size);
691int t3_set_proto_sram(struct adapter *adap, const u8 *data);
691int t3_read_flash(struct adapter *adapter, unsigned int addr, 692int t3_read_flash(struct adapter *adapter, unsigned int addr,
692 unsigned int nwords, u32 *data, int byte_oriented); 693 unsigned int nwords, u32 *data, int byte_oriented);
693int t3_load_fw(struct adapter *adapter, const u8 * fw_data, unsigned int size); 694int t3_load_fw(struct adapter *adapter, const u8 * fw_data, unsigned int size);
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index d405a932c73a..47d51788a462 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -923,7 +923,8 @@ int t3_check_tpsram_version(struct adapter *adapter, int *must_load)
923 * Checks if an adapter's tp sram is compatible with the driver. 923 * Checks if an adapter's tp sram is compatible with the driver.
924 * Returns 0 if the versions are compatible, a negative error otherwise. 924 * Returns 0 if the versions are compatible, a negative error otherwise.
925 */ 925 */
926int t3_check_tpsram(struct adapter *adapter, u8 *tp_sram, unsigned int size) 926int t3_check_tpsram(struct adapter *adapter, const u8 *tp_sram,
927 unsigned int size)
927{ 928{
928 u32 csum; 929 u32 csum;
929 unsigned int i; 930 unsigned int i;
@@ -2875,10 +2876,10 @@ static void ulp_config(struct adapter *adap, const struct tp_params *p)
2875 * 2876 *
2876 * Write the contents of the protocol SRAM. 2877 * Write the contents of the protocol SRAM.
2877 */ 2878 */
2878int t3_set_proto_sram(struct adapter *adap, u8 *data) 2879int t3_set_proto_sram(struct adapter *adap, const u8 *data)
2879{ 2880{
2880 int i; 2881 int i;
2881 __be32 *buf = (__be32 *)data; 2882 const __be32 *buf = (const __be32 *)data;
2882 2883
2883 for (i = 0; i < PROTO_SRAM_LINES; i++) { 2884 for (i = 0; i < PROTO_SRAM_LINES; i++) {
2884 t3_write_reg(adap, A_TP_EMBED_OP_FIELD5, be32_to_cpu(*buf++)); 2885 t3_write_reg(adap, A_TP_EMBED_OP_FIELD5, be32_to_cpu(*buf++));