Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94c609f5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: Add a unique string for clock driver's kernel log messages"

parents 998590af 9abd7948

drivers/clk/clk.c

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 * Standard functionality for the common clock API.  See Documentation/clk.txt

 */



#define pr_fmt(fmt) "clk: " fmt



#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/clk/clk-conf.h>

drivers/clk/qcom/camcc-sdm845.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * GNU General Public License for more details.

 */



#define pr_fmt(fmt) "clk: %s: " fmt, __func__



#include <linux/kernel.h>

#include <linux/bitops.h>

#include <linux/err.h>

drivers/clk/qcom/clk-alpha-pll.c

+4 −2
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * GNU General Public License for more details.

 */



#define pr_fmt(fmt) "clk: %s: " fmt, __func__



#include <linux/kernel.h>

#include <linux/export.h>

#include <linux/clk-provider.h>
@@ -100,7 +102,7 @@ static int wait_for_pll(struct clk_alpha_pll *pll, u32 mask, bool inverse, 
		udelay(1);

	}



	WARN(1, "%s failed to %s!\n", name, action);

	WARN(1, "clk: %s failed to %s!\n", name, action);

	return -ETIMEDOUT;

}
@@ -635,7 +637,7 @@ static int clk_fabia_pll_set_rate(struct clk_hw *hw, unsigned long rate, 
	udelay(1);

	regmap_read(pll->clkr.regmap, off + PLL_MODE, &regval);

	if (!(regval & FABIA_PLL_ACK_LATCH)) {

		WARN(1, "PLL latch failed. Output may be unstable!\n");

		WARN(1, "clk: PLL latch failed. Output may be unstable!\n");

		return -EINVAL;

	}

drivers/clk/qcom/clk-aop-qmp.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 * GNU General Public License for more details.

 */



#define pr_fmt(fmt) "%s: " fmt, __func__

#define pr_fmt(fmt) "clk: %s: " fmt, __func__



#include <linux/clk-provider.h>

#include <linux/clk.h>

drivers/clk/qcom/clk-branch.c

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * GNU General Public License for more details.

 */



#define pr_fmt(fmt) "clk: %s: " fmt, __func__



#include <linux/kernel.h>

#include <linux/bitops.h>

#include <linux/err.h>
@@ -97,7 +99,7 @@ static int clk_branch_wait(const struct clk_branch *br, bool enabling, 
				return 0;

			udelay(1);

		}

		WARN(1, "%s status stuck at 'o%s'", name,

		WARN(1, "clk: %s status stuck at 'o%s'", name,

				enabling ? "ff" : "n");

		return -EBUSY;

	}