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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'net-dsa-rzn1_a5psw-add-compile_test'

Rosen Penev says:

====================
net: dsa: rzn1_a5psw: add COMPILE_TEST

Allows the various bots to test compilation. Also threw in a small devm
conversion for enabling clocks.
====================

Link: https://patch.msgid.link/20250708014144.2514-1-rosenp@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

Paolo Abeni e090f978 45e359be

+5 -19
+1 -1
drivers/net/dsa/Kconfig
··· 92 92 93 93 config NET_DSA_RZN1_A5PSW 94 94 tristate "Renesas RZ/N1 A5PSW Ethernet switch support" 95 - depends on OF && ARCH_RZN1 95 + depends on OF && (ARCH_RZN1 || COMPILE_TEST) 96 96 select NET_DSA_TAG_RZN1_A5PSW 97 97 select PCS_RZN1_MIIC 98 98 help
+4 -18
drivers/net/dsa/rzn1_a5psw.c
··· 1227 1227 if (ret) 1228 1228 return ret; 1229 1229 1230 - a5psw->hclk = devm_clk_get(dev, "hclk"); 1230 + a5psw->hclk = devm_clk_get_enabled(dev, "hclk"); 1231 1231 if (IS_ERR(a5psw->hclk)) { 1232 1232 dev_err(dev, "failed get hclk clock\n"); 1233 1233 ret = PTR_ERR(a5psw->hclk); 1234 1234 goto free_pcs; 1235 1235 } 1236 1236 1237 - a5psw->clk = devm_clk_get(dev, "clk"); 1237 + a5psw->clk = devm_clk_get_enabled(dev, "clk"); 1238 1238 if (IS_ERR(a5psw->clk)) { 1239 1239 dev_err(dev, "failed get clk_switch clock\n"); 1240 1240 ret = PTR_ERR(a5psw->clk); 1241 1241 goto free_pcs; 1242 1242 } 1243 - 1244 - ret = clk_prepare_enable(a5psw->clk); 1245 - if (ret) 1246 - goto free_pcs; 1247 - 1248 - ret = clk_prepare_enable(a5psw->hclk); 1249 - if (ret) 1250 - goto clk_disable; 1251 1243 1252 1244 mdio = of_get_available_child_by_name(dev->of_node, "mdio"); 1253 1245 if (mdio) { ··· 1247 1255 of_node_put(mdio); 1248 1256 if (ret) { 1249 1257 dev_err(dev, "Failed to register MDIO: %d\n", ret); 1250 - goto hclk_disable; 1258 + goto free_pcs; 1251 1259 } 1252 1260 } 1253 1261 ··· 1261 1269 ret = dsa_register_switch(ds); 1262 1270 if (ret) { 1263 1271 dev_err(dev, "Failed to register DSA switch: %d\n", ret); 1264 - goto hclk_disable; 1272 + goto free_pcs; 1265 1273 } 1266 1274 1267 1275 return 0; 1268 1276 1269 - hclk_disable: 1270 - clk_disable_unprepare(a5psw->hclk); 1271 - clk_disable: 1272 - clk_disable_unprepare(a5psw->clk); 1273 1277 free_pcs: 1274 1278 a5psw_pcs_free(a5psw); 1275 1279 ··· 1281 1293 1282 1294 dsa_unregister_switch(&a5psw->ds); 1283 1295 a5psw_pcs_free(a5psw); 1284 - clk_disable_unprepare(a5psw->hclk); 1285 - clk_disable_unprepare(a5psw->clk); 1286 1296 } 1287 1297 1288 1298 static void a5psw_shutdown(struct platform_device *pdev)