Commit 345468ff authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Wentao Guan
Browse files

i2c: synquacer: Remove a clk reference from struct synquacer_i2c 

stable inclusion
from stable-v6.6.55
commit 6109f5319bfd944d359b16fd5f92666513585a1c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB0MX4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6109f5319bfd944d359b16fd5f92666513585a1c



--------------------------------

[ Upstream commit e6722ea6b9ed731f7392277d76ca912dfffca7ee ]

'pclk' is only used locally in the probe. Remove it from the
'synquacer_i2c' structure.

Also remove a useless debug message.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Stable-dep-of: f2990f863053 ("i2c: synquacer: Deal with optional PCLK correctly")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 6109f5319bfd944d359b16fd5f92666513585a1c)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent b2b5d1d0

drivers/i2c/busses/i2c-synquacer.c

+5 −6
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ struct synquacer_i2c { 
	int			irq;

	struct device		*dev;

	void __iomem		*base;

	struct clk		*pclk;

	u32			pclkrate;

	u32			speed_khz;

	u32			timeout_ms;
@@ -535,6 +534,7 @@ static const struct i2c_adapter synquacer_i2c_ops = { 
static int synquacer_i2c_probe(struct platform_device *pdev)

{

	struct synquacer_i2c *i2c;

	struct clk *pclk;

	u32 bus_speed;

	int ret;
@@ -550,13 +550,12 @@ static int synquacer_i2c_probe(struct platform_device *pdev) 
	device_property_read_u32(&pdev->dev, "socionext,pclk-rate",

				 &i2c->pclkrate);



	i2c->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");

	if (IS_ERR(i2c->pclk))

		return dev_err_probe(&pdev->dev, PTR_ERR(i2c->pclk),

	pclk = devm_clk_get_enabled(&pdev->dev, "pclk");

	if (IS_ERR(pclk))

		return dev_err_probe(&pdev->dev, PTR_ERR(pclk),

				     "failed to get and enable clock\n");



	dev_dbg(&pdev->dev, "clock source %p\n", i2c->pclk);

	i2c->pclkrate = clk_get_rate(i2c->pclk);

	i2c->pclkrate = clk_get_rate(pclk);



	if (i2c->pclkrate < SYNQUACER_I2C_MIN_CLK_RATE ||

	    i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE)