Skip to content

Commit 08ebd4c

Browse files
committed
soc: aspeed: lpc-snoop: Switch to devm_clk_get_enabled()
Simplify clock handling as done in other drivers. Link: https://patch.msgid.link/20250616-aspeed-lpc-snoop-fixes-v2-7-3cdd59c934d3@codeconstruct.com.au Acked-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
1 parent 6c64e1a commit 08ebd4c

1 file changed

Lines changed: 4 additions & 16 deletions

File tree

drivers/soc/aspeed/aspeed-lpc-snoop.c

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -328,43 +328,33 @@ static int aspeed_lpc_snoop_probe(struct platform_device *pdev)
328328
return -ENODEV;
329329
}
330330

331-
lpc_snoop->clk = devm_clk_get(dev, NULL);
331+
lpc_snoop->clk = devm_clk_get_enabled(dev, NULL);
332332
if (IS_ERR(lpc_snoop->clk)) {
333333
rc = PTR_ERR(lpc_snoop->clk);
334334
if (rc != -EPROBE_DEFER)
335335
dev_err(dev, "couldn't get clock\n");
336336
return rc;
337337
}
338-
rc = clk_prepare_enable(lpc_snoop->clk);
339-
if (rc) {
340-
dev_err(dev, "couldn't enable clock\n");
341-
return rc;
342-
}
343338

344339
rc = aspeed_lpc_snoop_config_irq(lpc_snoop, pdev);
345340
if (rc)
346-
goto err;
341+
return rc;
347342

348343
rc = aspeed_lpc_enable_snoop(lpc_snoop, dev, ASPEED_LPC_SNOOP_INDEX_0, port);
349344
if (rc)
350-
goto err;
345+
return rc;
351346

352347
/* Configuration of 2nd snoop channel port is optional */
353348
if (of_property_read_u32_index(dev->of_node, "snoop-ports",
354349
1, &port) == 0) {
355350
rc = aspeed_lpc_enable_snoop(lpc_snoop, dev, ASPEED_LPC_SNOOP_INDEX_1, port);
356351
if (rc) {
357352
aspeed_lpc_disable_snoop(lpc_snoop, ASPEED_LPC_SNOOP_INDEX_0);
358-
goto err;
353+
return rc;
359354
}
360355
}
361356

362357
return 0;
363-
364-
err:
365-
clk_disable_unprepare(lpc_snoop->clk);
366-
367-
return rc;
368358
}
369359

370360
static void aspeed_lpc_snoop_remove(struct platform_device *pdev)
@@ -374,8 +364,6 @@ static void aspeed_lpc_snoop_remove(struct platform_device *pdev)
374364
/* Disable both snoop channels */
375365
aspeed_lpc_disable_snoop(lpc_snoop, ASPEED_LPC_SNOOP_INDEX_0);
376366
aspeed_lpc_disable_snoop(lpc_snoop, ASPEED_LPC_SNOOP_INDEX_1);
377-
378-
clk_disable_unprepare(lpc_snoop->clk);
379367
}
380368

381369
static const struct aspeed_lpc_snoop_model_data ast2400_model_data = {

0 commit comments

Comments
 (0)