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

clk: milbeaut: convert from round_rate() to determine_rate()

The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate() using the Coccinelle semantic patch
on the cover letter of this series.

Signed-off-by: Brian Masney <bmasney@redhat.com>

+14 -8
+14 -8
drivers/clk/clk-milbeaut.c
··· 386 386 divider->flags, divider->width); 387 387 } 388 388 389 - static long m10v_clk_divider_round_rate(struct clk_hw *hw, unsigned long rate, 390 - unsigned long *prate) 389 + static int m10v_clk_divider_determine_rate(struct clk_hw *hw, 390 + struct clk_rate_request *req) 391 391 { 392 392 struct m10v_clk_divider *divider = to_m10v_div(hw); 393 393 ··· 398 398 val = readl(divider->reg) >> divider->shift; 399 399 val &= clk_div_mask(divider->width); 400 400 401 - return divider_ro_round_rate(hw, rate, prate, divider->table, 402 - divider->width, divider->flags, 403 - val); 401 + req->rate = divider_ro_round_rate(hw, req->rate, 402 + &req->best_parent_rate, 403 + divider->table, 404 + divider->width, 405 + divider->flags, val); 406 + 407 + return 0; 404 408 } 405 409 406 - return divider_round_rate(hw, rate, prate, divider->table, 407 - divider->width, divider->flags); 410 + req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate, 411 + divider->table, divider->width, divider->flags); 412 + 413 + return 0; 408 414 } 409 415 410 416 static int m10v_clk_divider_set_rate(struct clk_hw *hw, unsigned long rate, ··· 456 450 457 451 static const struct clk_ops m10v_clk_divider_ops = { 458 452 .recalc_rate = m10v_clk_divider_recalc_rate, 459 - .round_rate = m10v_clk_divider_round_rate, 453 + .determine_rate = m10v_clk_divider_determine_rate, 460 454 .set_rate = m10v_clk_divider_set_rate, 461 455 }; 462 456