diff options
author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-08-16 21:50:04 -0400 |
---|---|---|
committer | Luciano Coelho <luciano.coelho@nokia.com> | 2010-09-28 05:15:08 -0400 |
commit | 165530974504e21d79a43e5f964bd9284e45a8f1 (patch) | |
tree | a339e959ea561d2d6f46ed9cecd7a47dd8f46c4d /drivers | |
parent | 03f06b7efc8cbc666bd096b68bdf955388e0b323 (diff) |
wl1271: Remove acx_fw_version function
It's not used anywhere.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_acx.c | 34 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_acx.h | 30 |
2 files changed, 0 insertions, 64 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/wl1271_acx.c index f03ad088db8b..618993405262 100644 --- a/drivers/net/wireless/wl12xx/wl1271_acx.c +++ b/drivers/net/wireless/wl12xx/wl1271_acx.c | |||
@@ -86,40 +86,6 @@ out: | |||
86 | return ret; | 86 | return ret; |
87 | } | 87 | } |
88 | 88 | ||
89 | int wl1271_acx_fw_version(struct wl1271 *wl, char *buf, size_t len) | ||
90 | { | ||
91 | struct acx_revision *rev; | ||
92 | int ret; | ||
93 | |||
94 | wl1271_debug(DEBUG_ACX, "acx fw rev"); | ||
95 | |||
96 | rev = kzalloc(sizeof(*rev), GFP_KERNEL); | ||
97 | if (!rev) { | ||
98 | ret = -ENOMEM; | ||
99 | goto out; | ||
100 | } | ||
101 | |||
102 | ret = wl1271_cmd_interrogate(wl, ACX_FW_REV, rev, sizeof(*rev)); | ||
103 | if (ret < 0) { | ||
104 | wl1271_warning("ACX_FW_REV interrogate failed"); | ||
105 | goto out; | ||
106 | } | ||
107 | |||
108 | /* be careful with the buffer sizes */ | ||
109 | strncpy(buf, rev->fw_version, min(len, sizeof(rev->fw_version))); | ||
110 | |||
111 | /* | ||
112 | * if the firmware version string is exactly | ||
113 | * sizeof(rev->fw_version) long or fw_len is less than | ||
114 | * sizeof(rev->fw_version) it won't be null terminated | ||
115 | */ | ||
116 | buf[min(len, sizeof(rev->fw_version)) - 1] = '\0'; | ||
117 | |||
118 | out: | ||
119 | kfree(rev); | ||
120 | return ret; | ||
121 | } | ||
122 | |||
123 | int wl1271_acx_tx_power(struct wl1271 *wl, int power) | 89 | int wl1271_acx_tx_power(struct wl1271 *wl, int power) |
124 | { | 90 | { |
125 | struct acx_current_tx_power *acx; | 91 | struct acx_current_tx_power *acx; |
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h index 5c8bb7fd2eb9..ebb341d36e8c 100644 --- a/drivers/net/wireless/wl12xx/wl1271_acx.h +++ b/drivers/net/wireless/wl12xx/wl1271_acx.h | |||
@@ -100,35 +100,6 @@ struct acx_error_counter { | |||
100 | __le32 seq_num_miss; | 100 | __le32 seq_num_miss; |
101 | } __packed; | 101 | } __packed; |
102 | 102 | ||
103 | struct acx_revision { | ||
104 | struct acx_header header; | ||
105 | |||
106 | /* | ||
107 | * The WiLink firmware version, an ASCII string x.x.x.x, | ||
108 | * that uniquely identifies the current firmware. | ||
109 | * The left most digit is incremented each time a | ||
110 | * significant change is made to the firmware, such as | ||
111 | * code redesign or new platform support. | ||
112 | * The second digit is incremented when major enhancements | ||
113 | * are added or major fixes are made. | ||
114 | * The third digit is incremented for each GA release. | ||
115 | * The fourth digit is incremented for each build. | ||
116 | * The first two digits identify a firmware release version, | ||
117 | * in other words, a unique set of features. | ||
118 | * The first three digits identify a GA release. | ||
119 | */ | ||
120 | char fw_version[20]; | ||
121 | |||
122 | /* | ||
123 | * This 4 byte field specifies the WiLink hardware version. | ||
124 | * bits 0 - 15: Reserved. | ||
125 | * bits 16 - 23: Version ID - The WiLink version ID | ||
126 | * (1 = first spin, 2 = second spin, and so on). | ||
127 | * bits 24 - 31: Chip ID - The WiLink chip ID. | ||
128 | */ | ||
129 | __le32 hw_version; | ||
130 | } __packed; | ||
131 | |||
132 | enum wl1271_psm_mode { | 103 | enum wl1271_psm_mode { |
133 | /* Active mode */ | 104 | /* Active mode */ |
134 | WL1271_PSM_CAM = 0, | 105 | WL1271_PSM_CAM = 0, |
@@ -1076,7 +1047,6 @@ enum { | |||
1076 | 1047 | ||
1077 | int wl1271_acx_wake_up_conditions(struct wl1271 *wl); | 1048 | int wl1271_acx_wake_up_conditions(struct wl1271 *wl); |
1078 | int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth); | 1049 | int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth); |
1079 | int wl1271_acx_fw_version(struct wl1271 *wl, char *buf, size_t len); | ||
1080 | int wl1271_acx_tx_power(struct wl1271 *wl, int power); | 1050 | int wl1271_acx_tx_power(struct wl1271 *wl, int power); |
1081 | int wl1271_acx_feature_cfg(struct wl1271 *wl); | 1051 | int wl1271_acx_feature_cfg(struct wl1271 *wl); |
1082 | int wl1271_acx_mem_map(struct wl1271 *wl, | 1052 | int wl1271_acx_mem_map(struct wl1271 *wl, |