Commit b42ed9fd authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Andi Shyti
Browse files

i2c: riic: Use temporary variable for struct device 



Use a temporary variable for the struct device pointers to avoid
dereferencing.

Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 982959ff

drivers/i2c/busses/i2c-riic.c

+26 −23
Original line number Diff line number Diff line
@@ -131,11 +131,12 @@ static inline void riic_clear_set_bit(struct riic_dev *riic, u8 clear, u8 set, u 
static int riic_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)

{

	struct riic_dev *riic = i2c_get_adapdata(adap);

	struct device *dev = adap->dev.parent;

	unsigned long time_left;

	int i;

	u8 start_bit;



	pm_runtime_get_sync(adap->dev.parent);

	pm_runtime_get_sync(dev);



	if (riic_readb(riic, RIIC_ICCR2) & ICCR2_BBSY) {

		riic->err = -EBUSY;
@@ -168,7 +169,7 @@ static int riic_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) 
	}



 out:

	pm_runtime_put(adap->dev.parent);

	pm_runtime_put(dev);



	return riic->err ?: num;

}
@@ -303,8 +304,9 @@ static int riic_init_hw(struct riic_dev *riic, struct i2c_timings *t) 
	int ret = 0;

	unsigned long rate;

	int total_ticks, cks, brl, brh;

	struct device *dev = riic->adapter.dev.parent;



	pm_runtime_get_sync(riic->adapter.dev.parent);

	pm_runtime_get_sync(dev);



	if (t->bus_freq_hz > I2C_MAX_FAST_MODE_FREQ) {

		dev_err(&riic->adapter.dev,
@@ -396,7 +398,7 @@ static int riic_init_hw(struct riic_dev *riic, struct i2c_timings *t) 
	riic_clear_set_bit(riic, ICCR1_IICRST, 0, RIIC_ICCR1);



out:

	pm_runtime_put(riic->adapter.dev.parent);

	pm_runtime_put(dev);

	return ret;

}
@@ -415,13 +417,14 @@ static void riic_reset_control_assert(void *data) 


static int riic_i2c_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct riic_dev *riic;

	struct i2c_adapter *adap;

	struct i2c_timings i2c_t;

	struct reset_control *rstc;

	int i, ret;



	riic = devm_kzalloc(&pdev->dev, sizeof(*riic), GFP_KERNEL);

	riic = devm_kzalloc(dev, sizeof(*riic), GFP_KERNEL);

	if (!riic)

		return -ENOMEM;
@@ -429,22 +432,22 @@ static int riic_i2c_probe(struct platform_device *pdev) 
	if (IS_ERR(riic->base))

		return PTR_ERR(riic->base);



	riic->clk = devm_clk_get(&pdev->dev, NULL);

	riic->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(riic->clk)) {

		dev_err(&pdev->dev, "missing controller clock");

		dev_err(dev, "missing controller clock");

		return PTR_ERR(riic->clk);

	}



	rstc = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);

	rstc = devm_reset_control_get_optional_exclusive(dev, NULL);

	if (IS_ERR(rstc))

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

		return dev_err_probe(dev, PTR_ERR(rstc),

				     "Error: missing reset ctrl\n");



	ret = reset_control_deassert(rstc);

	if (ret)

		return ret;



	ret = devm_add_action_or_reset(&pdev->dev, riic_reset_control_assert, rstc);

	ret = devm_add_action_or_reset(dev, riic_reset_control_assert, rstc);

	if (ret)

		return ret;
@@ -453,29 +456,29 @@ static int riic_i2c_probe(struct platform_device *pdev) 
		if (ret < 0)

			return ret;



		ret = devm_request_irq(&pdev->dev, ret, riic_irqs[i].isr,

		ret = devm_request_irq(dev, ret, riic_irqs[i].isr,

				       0, riic_irqs[i].name, riic);

		if (ret) {

			dev_err(&pdev->dev, "failed to request irq %s\n", riic_irqs[i].name);

			dev_err(dev, "failed to request irq %s\n", riic_irqs[i].name);

			return ret;

		}

	}



	riic->info = of_device_get_match_data(&pdev->dev);

	riic->info = of_device_get_match_data(dev);



	adap = &riic->adapter;

	i2c_set_adapdata(adap, riic);

	strscpy(adap->name, "Renesas RIIC adapter", sizeof(adap->name));

	adap->owner = THIS_MODULE;

	adap->algo = &riic_algo;

	adap->dev.parent = &pdev->dev;

	adap->dev.of_node = pdev->dev.of_node;

	adap->dev.parent = dev;

	adap->dev.of_node = dev->of_node;



	init_completion(&riic->msg_done);



	i2c_parse_fw_timings(&pdev->dev, &i2c_t, true);

	i2c_parse_fw_timings(dev, &i2c_t, true);



	pm_runtime_enable(&pdev->dev);

	pm_runtime_enable(dev);



	ret = riic_init_hw(riic, &i2c_t);

	if (ret)
@@ -487,24 +490,24 @@ static int riic_i2c_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, riic);



	dev_info(&pdev->dev, "registered with %dHz bus speed\n",

		 i2c_t.bus_freq_hz);

	dev_info(dev, "registered with %dHz bus speed\n", i2c_t.bus_freq_hz);

	return 0;



out:

	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(dev);

	return ret;

}



static void riic_i2c_remove(struct platform_device *pdev)

{

	struct riic_dev *riic = platform_get_drvdata(pdev);

	struct device *dev = &pdev->dev;



	pm_runtime_get_sync(&pdev->dev);

	pm_runtime_get_sync(dev);

	riic_writeb(riic, 0, RIIC_ICIER);

	pm_runtime_put(&pdev->dev);

	pm_runtime_put(dev);

	i2c_del_adapter(&riic->adapter);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(dev);

}



static const struct riic_of_data riic_rz_a_info = {