diff options
author | Roland Dreier <rdreier@cisco.com> | 2010-04-21 04:59:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-22 02:00:43 -0400 |
commit | de498c89254b5b89f676e9c9292396d5ebf52bf2 (patch) | |
tree | 2976ebf664011f5260ef6fe91f527afe4b6c3495 /drivers/net/cxgb4/t4_hw.c | |
parent | 62718b328f972f1559feb96dfccc15fc9f4c9a2c (diff) |
cxgb4: Make unnecessarily global functions static
Also put t4_write_indirect() inside "#if 0" to avoid a "defined but not
used" compile warning.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb4/t4_hw.c')
-rw-r--r-- | drivers/net/cxgb4/t4_hw.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c index a814a3afe123..cadead5170f5 100644 --- a/drivers/net/cxgb4/t4_hw.c +++ b/drivers/net/cxgb4/t4_hw.c | |||
@@ -53,8 +53,8 @@ | |||
53 | * at the time it indicated completion is stored there. Returns 0 if the | 53 | * at the time it indicated completion is stored there. Returns 0 if the |
54 | * operation completes and -EAGAIN otherwise. | 54 | * operation completes and -EAGAIN otherwise. |
55 | */ | 55 | */ |
56 | int t4_wait_op_done_val(struct adapter *adapter, int reg, u32 mask, | 56 | static int t4_wait_op_done_val(struct adapter *adapter, int reg, u32 mask, |
57 | int polarity, int attempts, int delay, u32 *valp) | 57 | int polarity, int attempts, int delay, u32 *valp) |
58 | { | 58 | { |
59 | while (1) { | 59 | while (1) { |
60 | u32 val = t4_read_reg(adapter, reg); | 60 | u32 val = t4_read_reg(adapter, reg); |
@@ -109,9 +109,9 @@ void t4_set_reg_field(struct adapter *adapter, unsigned int addr, u32 mask, | |||
109 | * Reads registers that are accessed indirectly through an address/data | 109 | * Reads registers that are accessed indirectly through an address/data |
110 | * register pair. | 110 | * register pair. |
111 | */ | 111 | */ |
112 | void t4_read_indirect(struct adapter *adap, unsigned int addr_reg, | 112 | static void t4_read_indirect(struct adapter *adap, unsigned int addr_reg, |
113 | unsigned int data_reg, u32 *vals, unsigned int nregs, | 113 | unsigned int data_reg, u32 *vals, |
114 | unsigned int start_idx) | 114 | unsigned int nregs, unsigned int start_idx) |
115 | { | 115 | { |
116 | while (nregs--) { | 116 | while (nregs--) { |
117 | t4_write_reg(adap, addr_reg, start_idx); | 117 | t4_write_reg(adap, addr_reg, start_idx); |
@@ -120,6 +120,7 @@ void t4_read_indirect(struct adapter *adap, unsigned int addr_reg, | |||
120 | } | 120 | } |
121 | } | 121 | } |
122 | 122 | ||
123 | #if 0 | ||
123 | /** | 124 | /** |
124 | * t4_write_indirect - write indirectly addressed registers | 125 | * t4_write_indirect - write indirectly addressed registers |
125 | * @adap: the adapter | 126 | * @adap: the adapter |
@@ -132,15 +133,16 @@ void t4_read_indirect(struct adapter *adap, unsigned int addr_reg, | |||
132 | * Writes a sequential block of registers that are accessed indirectly | 133 | * Writes a sequential block of registers that are accessed indirectly |
133 | * through an address/data register pair. | 134 | * through an address/data register pair. |
134 | */ | 135 | */ |
135 | void t4_write_indirect(struct adapter *adap, unsigned int addr_reg, | 136 | static void t4_write_indirect(struct adapter *adap, unsigned int addr_reg, |
136 | unsigned int data_reg, const u32 *vals, | 137 | unsigned int data_reg, const u32 *vals, |
137 | unsigned int nregs, unsigned int start_idx) | 138 | unsigned int nregs, unsigned int start_idx) |
138 | { | 139 | { |
139 | while (nregs--) { | 140 | while (nregs--) { |
140 | t4_write_reg(adap, addr_reg, start_idx++); | 141 | t4_write_reg(adap, addr_reg, start_idx++); |
141 | t4_write_reg(adap, data_reg, *vals++); | 142 | t4_write_reg(adap, data_reg, *vals++); |
142 | } | 143 | } |
143 | } | 144 | } |
145 | #endif | ||
144 | 146 | ||
145 | /* | 147 | /* |
146 | * Get the reply to a mailbox command and store it in @rpl in big-endian order. | 148 | * Get the reply to a mailbox command and store it in @rpl in big-endian order. |
@@ -537,8 +539,8 @@ static int flash_wait_op(struct adapter *adapter, int attempts, int delay) | |||
537 | * (i.e., big-endian), otherwise as 32-bit words in the platform's | 539 | * (i.e., big-endian), otherwise as 32-bit words in the platform's |
538 | * natural endianess. | 540 | * natural endianess. |
539 | */ | 541 | */ |
540 | int t4_read_flash(struct adapter *adapter, unsigned int addr, | 542 | static int t4_read_flash(struct adapter *adapter, unsigned int addr, |
541 | unsigned int nwords, u32 *data, int byte_oriented) | 543 | unsigned int nwords, u32 *data, int byte_oriented) |
542 | { | 544 | { |
543 | int ret; | 545 | int ret; |
544 | 546 | ||