Commit 31b5fea3 authored by Brian Masney's avatar Brian Masney Committed by Alexandre Belloni
Browse files

rtc: ds1307: 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: default avatarBrian Masney <bmasney@redhat.com>
Link: https://lore.kernel.org/r/20250710-rtc-clk-round-rate-v1-7-33140bb2278e@redhat.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent b574acb3

drivers/rtc/rtc-ds1307.c

+11 −6
Original line number Diff line number Diff line
@@ -1467,17 +1467,22 @@ static unsigned long ds3231_clk_sqw_recalc_rate(struct clk_hw *hw, 
	return ds3231_clk_sqw_rates[rate_sel];

}



static long ds3231_clk_sqw_round_rate(struct clk_hw *hw, unsigned long rate,

				      unsigned long *prate)

static int ds3231_clk_sqw_determine_rate(struct clk_hw *hw,

					 struct clk_rate_request *req)

{

	int i;



	for (i = ARRAY_SIZE(ds3231_clk_sqw_rates) - 1; i >= 0; i--) {

		if (ds3231_clk_sqw_rates[i] <= rate)

			return ds3231_clk_sqw_rates[i];

		if (ds3231_clk_sqw_rates[i] <= req->rate) {

			req->rate = ds3231_clk_sqw_rates[i];



			return 0;

		}

	}



	return ds3231_clk_sqw_rates[ARRAY_SIZE(ds3231_clk_sqw_rates) - 1];

	req->rate = ds3231_clk_sqw_rates[ARRAY_SIZE(ds3231_clk_sqw_rates) - 1];



	return 0;

}



static int ds3231_clk_sqw_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -1536,7 +1541,7 @@ static const struct clk_ops ds3231_clk_sqw_ops = { 
	.unprepare = ds3231_clk_sqw_unprepare,

	.is_prepared = ds3231_clk_sqw_is_prepared,

	.recalc_rate = ds3231_clk_sqw_recalc_rate,

	.round_rate = ds3231_clk_sqw_round_rate,

	.determine_rate = ds3231_clk_sqw_determine_rate,

	.set_rate = ds3231_clk_sqw_set_rate,

};