Re: [PATCH v3 23/25] i2c: designware: Use temporary variable for struct device

[Mario Limonciello <mario.limonciello@xxxxxxx>]

On 11/10/2023 12:11, Andy Shevchenko wrote:
> Use temporary variable for struct device to make code neater.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Reviewed-by: Mario Limonciello <mario.limonciello@xxxxxxx>
> ---
>   drivers/i2c/busses/i2c-designware-pcidrv.c  | 24 +++++++-------
>   drivers/i2c/busses/i2c-designware-platdrv.c | 35 ++++++++++-----------
>   2 files changed, 27 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
> index 826c0c0a7c8d..34002c5eb67c 100644
> --- a/drivers/i2c/busses/i2c-designware-pcidrv.c
> +++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
> @@ -207,6 +207,7 @@ static const struct software_node dgpu_node = {
>   static int i2c_dw_pci_probe(struct pci_dev *pdev,
>   			    const struct pci_device_id *id)
>   {
> +	struct device *device = &pdev->dev;
>   	struct dw_i2c_dev *dev;
>   	struct i2c_adapter *adap;
>   	int r;
> @@ -214,25 +215,22 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
>   	struct dw_scl_sda_cfg *cfg;
>   
>   	if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers))
> -		return dev_err_probe(&pdev->dev, -EINVAL,
> -				     "Invalid driver data %ld\n",
> +		return dev_err_probe(device, -EINVAL, "Invalid driver data %ld\n",
>   				     id->driver_data);
>   
>   	controller = &dw_pci_controllers[id->driver_data];
>   
>   	r = pcim_enable_device(pdev);
>   	if (r)
> -		return dev_err_probe(&pdev->dev, r,
> -				     "Failed to enable I2C PCI device\n");
> +		return dev_err_probe(device, r, "Failed to enable I2C PCI device\n");
>   
>   	pci_set_master(pdev);
>   
>   	r = pcim_iomap_regions(pdev, 1 << 0, pci_name(pdev));
>   	if (r)
> -		return dev_err_probe(&pdev->dev, r,
> -				     "I/O memory remapping failed\n");
> +		return dev_err_probe(device, r, "I/O memory remapping failed\n");
>   
> -	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
> +	dev = devm_kzalloc(device, sizeof(*dev), GFP_KERNEL);
>   	if (!dev)
>   		return -ENOMEM;
>   
> @@ -242,7 +240,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
>   
>   	dev->get_clk_rate_khz = controller->get_clk_rate_khz;
>   	dev->base = pcim_iomap_table(pdev)[0];
> -	dev->dev = &pdev->dev;
> +	dev->dev = device;
>   	dev->irq = pci_irq_vector(pdev, 0);
>   	dev->flags |= controller->flags;
>   
> @@ -281,14 +279,14 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
>   	if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) {
>   		dev->slave = i2c_new_ccgx_ucsi(&dev->adapter, dev->irq, &dgpu_node);
>   		if (IS_ERR(dev->slave))
> -			return dev_err_probe(dev->dev, PTR_ERR(dev->slave),
> +			return dev_err_probe(device, PTR_ERR(dev->slave),
>   					     "register UCSI failed\n");
>   	}
>   
> -	pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);
> -	pm_runtime_use_autosuspend(&pdev->dev);
> -	pm_runtime_put_autosuspend(&pdev->dev);
> -	pm_runtime_allow(&pdev->dev);
> +	pm_runtime_set_autosuspend_delay(device, 1000);
> +	pm_runtime_use_autosuspend(device);
> +	pm_runtime_put_autosuspend(device);
> +	pm_runtime_allow(device);
>   
>   	return 0;
>   }
> diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
> index 1b76f721bf81..02dc1d1001f2 100644
> --- a/drivers/i2c/busses/i2c-designware-platdrv.c
> +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
> @@ -237,6 +237,7 @@ static int dw_i2c_plat_get_reset(struct dw_i2c_dev *dev)
>   
>   static int dw_i2c_plat_probe(struct platform_device *pdev)
>   {
> +	struct device *device = &pdev->dev;
>   	struct i2c_adapter *adap;
>   	struct dw_i2c_dev *dev;
>   	int irq, ret;
> @@ -245,15 +246,15 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
>   	if (irq < 0)
>   		return irq;
>   
> -	dev = devm_kzalloc(&pdev->dev, sizeof(struct dw_i2c_dev), GFP_KERNEL);
> +	dev = devm_kzalloc(device, sizeof(*dev), GFP_KERNEL);
>   	if (!dev)
>   		return -ENOMEM;
>   
> -	dev->flags = (uintptr_t)device_get_match_data(&pdev->dev);
> -	if (device_property_present(&pdev->dev, "wx,i2c-snps-model"))
> +	dev->flags = (uintptr_t)device_get_match_data(device);
> +	if (device_property_present(device, "wx,i2c-snps-model"))
>   		dev->flags = MODEL_WANGXUN_SP;
>   
> -	dev->dev = &pdev->dev;
> +	dev->dev = device;
>   	dev->irq = irq;
>   	platform_set_drvdata(pdev, dev);
>   
> @@ -276,11 +277,11 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
>   	i2c_dw_configure(dev);
>   
>   	/* Optional interface clock */
> -	dev->pclk = devm_clk_get_optional(&pdev->dev, "pclk");
> +	dev->pclk = devm_clk_get_optional(device, "pclk");
>   	if (IS_ERR(dev->pclk))
>   		return PTR_ERR(dev->pclk);
>   
> -	dev->clk = devm_clk_get_optional(&pdev->dev, NULL);
> +	dev->clk = devm_clk_get_optional(device, NULL);
>   	if (IS_ERR(dev->clk))
>   		return PTR_ERR(dev->clk);
>   
> @@ -306,23 +307,19 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
>   					I2C_CLASS_HWMON : I2C_CLASS_DEPRECATED;
>   	adap->nr = -1;
>   
> -	if (dev->flags & ACCESS_NO_IRQ_SUSPEND) {
> -		dev_pm_set_driver_flags(&pdev->dev,
> -					DPM_FLAG_SMART_PREPARE);
> -	} else {
> -		dev_pm_set_driver_flags(&pdev->dev,
> -					DPM_FLAG_SMART_PREPARE |
> -					DPM_FLAG_SMART_SUSPEND);
> -	}
> +	if (dev->flags & ACCESS_NO_IRQ_SUSPEND)
> +		dev_pm_set_driver_flags(device, DPM_FLAG_SMART_PREPARE);
> +	else
> +		dev_pm_set_driver_flags(device, DPM_FLAG_SMART_PREPARE | DPM_FLAG_SMART_SUSPEND);
>   
> -	device_enable_async_suspend(&pdev->dev);
> +	device_enable_async_suspend(device);
>   
>   	/* The code below assumes runtime PM to be disabled. */
> -	WARN_ON(pm_runtime_enabled(&pdev->dev));
> +	WARN_ON(pm_runtime_enabled(device));
>   
> -	pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);
> -	pm_runtime_use_autosuspend(&pdev->dev);
> -	pm_runtime_set_active(&pdev->dev);
> +	pm_runtime_set_autosuspend_delay(device, 1000);
> +	pm_runtime_use_autosuspend(device);
> +	pm_runtime_set_active(device);
>   
>   	ret = dw_i2c_plat_pm_setup(dev);
>   	if (ret)