Commit c2c25be6 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang
Browse files

i2c: nvidia-gpu: Use temporary variable for struct device 



Use temporary variable for struct device to make code neater.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 2079563d

drivers/i2c/busses/i2c-nvidia-gpu.c

+14 −14
Original line number Diff line number Diff line
@@ -270,19 +270,20 @@ static const struct software_node ccgx_node = { 


static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	struct device *dev = &pdev->dev;

	struct gpu_i2c_dev *i2cd;

	int status;



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

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

	if (!i2cd)

		return -ENOMEM;



	i2cd->dev = &pdev->dev;

	dev_set_drvdata(&pdev->dev, i2cd);

	i2cd->dev = dev;

	dev_set_drvdata(dev, i2cd);



	status = pcim_enable_device(pdev);

	if (status < 0) {

		dev_err(&pdev->dev, "pcim_enable_device failed %d\n", status);

		dev_err(dev, "pcim_enable_device failed %d\n", status);

		return status;

	}
@@ -290,13 +291,13 @@ static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	i2cd->regs = pcim_iomap(pdev, 0, 0);

	if (!i2cd->regs) {

		dev_err(&pdev->dev, "pcim_iomap failed\n");

		dev_err(dev, "pcim_iomap failed\n");

		return -ENOMEM;

	}



	status = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSI);

	if (status < 0) {

		dev_err(&pdev->dev, "pci_alloc_irq_vectors err %d\n", status);

		dev_err(dev, "pci_alloc_irq_vectors err %d\n", status);

		return status;

	}
@@ -308,22 +309,21 @@ static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		sizeof(i2cd->adapter.name));

	i2cd->adapter.algo = &gpu_i2c_algorithm;

	i2cd->adapter.quirks = &gpu_i2c_quirks;

	i2cd->adapter.dev.parent = &pdev->dev;

	i2cd->adapter.dev.parent = dev;

	status = i2c_add_adapter(&i2cd->adapter);

	if (status < 0)

		goto free_irq_vectors;



	i2cd->ccgx_client = i2c_new_ccgx_ucsi(&i2cd->adapter, pdev->irq, &ccgx_node);

	if (IS_ERR(i2cd->ccgx_client)) {

		status = dev_err_probe(&pdev->dev, PTR_ERR(i2cd->ccgx_client),

				       "register UCSI failed\n");

		status = dev_err_probe(dev, PTR_ERR(i2cd->ccgx_client), "register UCSI failed\n");

		goto del_adapter;

	}



	pm_runtime_set_autosuspend_delay(&pdev->dev, 3000);

	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_put_autosuspend(&pdev->dev);

	pm_runtime_allow(&pdev->dev);

	pm_runtime_set_autosuspend_delay(dev, 3000);

	pm_runtime_use_autosuspend(dev);

	pm_runtime_put_autosuspend(dev);

	pm_runtime_allow(dev);



	return 0;
@@ -336,7 +336,7 @@ static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


static void gpu_i2c_remove(struct pci_dev *pdev)

{

	struct gpu_i2c_dev *i2cd = dev_get_drvdata(&pdev->dev);

	struct gpu_i2c_dev *i2cd = pci_get_drvdata(pdev);



	pm_runtime_get_noresume(i2cd->dev);

	i2c_del_adapter(&i2cd->adapter);