Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Octeon: Kill cvmx_helper_link_autoconf()

Kill cvmx_helper_link_autoconf(). Nobody uses this function.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14626/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Aaro Koskinen and committed by
Ralf Baechle
2b58a76e 3c2b0239

+10 -75
+1 -2
arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c
··· 287 287 * Configure an IPD/PKO port for the specified link state. This 288 288 * function does not influence auto negotiation at the PHY level. 289 289 * The passed link state must always match the link state returned 290 - * by cvmx_helper_link_get(). It is normally best to use 291 - * cvmx_helper_link_autoconf() instead. 290 + * by cvmx_helper_link_get(). 292 291 * 293 292 * @ipd_port: IPD/PKO port to configure 294 293 * @link_info: The new link state
+1 -2
arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
··· 500 500 * Configure an IPD/PKO port for the specified link state. This 501 501 * function does not influence auto negotiation at the PHY level. 502 502 * The passed link state must always match the link state returned 503 - * by cvmx_helper_link_get(). It is normally best to use 504 - * cvmx_helper_link_autoconf() instead. 503 + * by cvmx_helper_link_get(). 505 504 * 506 505 * @ipd_port: IPD/PKO port to configure 507 506 * @link_info: The new link state
+1 -2
arch/mips/cavium-octeon/executive/cvmx-helper-spi.c
··· 188 188 * Configure an IPD/PKO port for the specified link state. This 189 189 * function does not influence auto negotiation at the PHY level. 190 190 * The passed link state must always match the link state returned 191 - * by cvmx_helper_link_get(). It is normally best to use 192 - * cvmx_helper_link_autoconf() instead. 191 + * by cvmx_helper_link_get(). 193 192 * 194 193 * @ipd_port: IPD/PKO port to configure 195 194 * @link_info: The new link state
+1 -2
arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
··· 295 295 * Configure an IPD/PKO port for the specified link state. This 296 296 * function does not influence auto negotiation at the PHY level. 297 297 * The passed link state must always match the link state returned 298 - * by cvmx_helper_link_get(). It is normally best to use 299 - * cvmx_helper_link_autoconf() instead. 298 + * by cvmx_helper_link_get(). 300 299 * 301 300 * @ipd_port: IPD/PKO port to configure 302 301 * @link_info: The new link state
+1 -46
arch/mips/cavium-octeon/executive/cvmx-helper.c
··· 69 69 /* Port count per interface */ 70 70 static int interface_port_count[5]; 71 71 72 - /* Port last configured link info index by IPD/PKO port */ 73 - static cvmx_helper_link_info_t 74 - port_link_info[CVMX_PIP_NUM_INPUT_PORTS]; 75 - 76 72 /** 77 73 * Return the number of interfaces the chip has. Each interface 78 74 * may have multiple ports. Most chips support two interfaces, ··· 1132 1136 } 1133 1137 1134 1138 /** 1135 - * Auto configure an IPD/PKO port link state and speed. This 1136 - * function basically does the equivalent of: 1137 - * cvmx_helper_link_set(ipd_port, cvmx_helper_link_get(ipd_port)); 1138 - * 1139 - * @ipd_port: IPD/PKO port to auto configure 1140 - * 1141 - * Returns Link state after configure 1142 - */ 1143 - cvmx_helper_link_info_t cvmx_helper_link_autoconf(int ipd_port) 1144 - { 1145 - cvmx_helper_link_info_t link_info; 1146 - int interface = cvmx_helper_get_interface_num(ipd_port); 1147 - int index = cvmx_helper_get_interface_index_num(ipd_port); 1148 - 1149 - if (index >= cvmx_helper_ports_on_interface(interface)) { 1150 - link_info.u64 = 0; 1151 - return link_info; 1152 - } 1153 - 1154 - link_info = cvmx_helper_link_get(ipd_port); 1155 - if (link_info.u64 == port_link_info[ipd_port].u64) 1156 - return link_info; 1157 - 1158 - /* If we fail to set the link speed, port_link_info will not change */ 1159 - cvmx_helper_link_set(ipd_port, link_info); 1160 - 1161 - /* 1162 - * port_link_info should be the current value, which will be 1163 - * different than expect if cvmx_helper_link_set() failed. 1164 - */ 1165 - return port_link_info[ipd_port]; 1166 - } 1167 - EXPORT_SYMBOL_GPL(cvmx_helper_link_autoconf); 1168 - 1169 - /** 1170 1139 * Return the link state of an IPD/PKO port as returned by 1171 1140 * auto negotiation. The result of this function may not match 1172 1141 * Octeon's link config if auto negotiation has changed since ··· 1194 1233 * Configure an IPD/PKO port for the specified link state. This 1195 1234 * function does not influence auto negotiation at the PHY level. 1196 1235 * The passed link state must always match the link state returned 1197 - * by cvmx_helper_link_get(). It is normally best to use 1198 - * cvmx_helper_link_autoconf() instead. 1236 + * by cvmx_helper_link_get(). 1199 1237 * 1200 1238 * @ipd_port: IPD/PKO port to configure 1201 1239 * @link_info: The new link state ··· 1236 1276 case CVMX_HELPER_INTERFACE_MODE_LOOP: 1237 1277 break; 1238 1278 } 1239 - /* Set the port_link_info here so that the link status is updated 1240 - no matter how cvmx_helper_link_set is called. We don't change 1241 - the value if link_set failed */ 1242 - if (result == 0) 1243 - port_link_info[ipd_port].u64 = link_info.u64; 1244 1279 return result; 1245 1280 } 1246 1281 EXPORT_SYMBOL_GPL(cvmx_helper_link_set);
+1 -2
arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
··· 80 80 * Configure an IPD/PKO port for the specified link state. This 81 81 * function does not influence auto negotiation at the PHY level. 82 82 * The passed link state must always match the link state returned 83 - * by cvmx_helper_link_get(). It is normally best to use 84 - * cvmx_helper_link_autoconf() instead. 83 + * by cvmx_helper_link_get(). 85 84 * 86 85 * @ipd_port: IPD/PKO port to configure 87 86 * @link_info: The new link state
+1 -2
arch/mips/include/asm/octeon/cvmx-helper-sgmii.h
··· 74 74 * Configure an IPD/PKO port for the specified link state. This 75 75 * function does not influence auto negotiation at the PHY level. 76 76 * The passed link state must always match the link state returned 77 - * by cvmx_helper_link_get(). It is normally best to use 78 - * cvmx_helper_link_autoconf() instead. 77 + * by cvmx_helper_link_get(). 79 78 * 80 79 * @ipd_port: IPD/PKO port to configure 81 80 * @link_info: The new link state
+1 -2
arch/mips/include/asm/octeon/cvmx-helper-spi.h
··· 71 71 * Configure an IPD/PKO port for the specified link state. This 72 72 * function does not influence auto negotiation at the PHY level. 73 73 * The passed link state must always match the link state returned 74 - * by cvmx_helper_link_get(). It is normally best to use 75 - * cvmx_helper_link_autoconf() instead. 74 + * by cvmx_helper_link_get(). 76 75 * 77 76 * @ipd_port: IPD/PKO port to configure 78 77 * @link_info: The new link state
+1 -2
arch/mips/include/asm/octeon/cvmx-helper-xaui.h
··· 74 74 * Configure an IPD/PKO port for the specified link state. This 75 75 * function does not influence auto negotiation at the PHY level. 76 76 * The passed link state must always match the link state returned 77 - * by cvmx_helper_link_get(). It is normally best to use 78 - * cvmx_helper_link_autoconf() instead. 77 + * by cvmx_helper_link_get(). 79 78 * 80 79 * @ipd_port: IPD/PKO port to configure 81 80 * @link_info: The new link state
+1 -13
arch/mips/include/asm/octeon/cvmx-helper.h
··· 156 156 interface); 157 157 158 158 /** 159 - * Auto configure an IPD/PKO port link state and speed. This 160 - * function basically does the equivalent of: 161 - * cvmx_helper_link_set(ipd_port, cvmx_helper_link_get(ipd_port)); 162 - * 163 - * @ipd_port: IPD/PKO port to auto configure 164 - * 165 - * Returns Link state after configure 166 - */ 167 - extern cvmx_helper_link_info_t cvmx_helper_link_autoconf(int ipd_port); 168 - 169 - /** 170 159 * Return the link state of an IPD/PKO port as returned by 171 160 * auto negotiation. The result of this function may not match 172 161 * Octeon's link config if auto negotiation has changed since ··· 171 182 * Configure an IPD/PKO port for the specified link state. This 172 183 * function does not influence auto negotiation at the PHY level. 173 184 * The passed link state must always match the link state returned 174 - * by cvmx_helper_link_get(). It is normally best to use 175 - * cvmx_helper_link_autoconf() instead. 185 + * by cvmx_helper_link_get(). 176 186 * 177 187 * @ipd_port: IPD/PKO port to configure 178 188 * @link_info: The new link state