Commit 6cc401be authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

ACPI: LPSS: Deduplicate skipping device in acpi_lpss_create_device() 



Add a new label to deduplicate skipping device code in the
acpi_lpss_create_device(). No functional change intended.

While at it, convert the last conditional to use the classical
pattern, i.e.

	if (err)
		...handle err...

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent da13b336

drivers/acpi/acpi_lpss.c

+13 −14
Original line number Diff line number Diff line
@@ -670,9 +670,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 
	if (!pdata->mmio_base) {

		/* Avoid acpi_bus_attach() instantiating a pdev for this dev. */

		adev->pnp.type.platform_id = 0;

		/* Skip the device, but continue the namespace scan. */

		ret = 0;

		goto err_out;

		goto out_free;

	}



	pdata->adev = adev;
@@ -683,11 +681,8 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 


	if (dev_desc->flags & LPSS_CLK) {

		ret = register_device_clock(adev, pdata);

		if (ret) {

			/* Skip the device, but continue the namespace scan. */

			ret = 0;

			goto err_out;

		}

		if (ret)

			goto out_free;

	}



	/*
@@ -699,14 +694,18 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 


	adev->driver_data = pdata;

	pdev = acpi_create_platform_device(adev, dev_desc->properties);

	if (!IS_ERR_OR_NULL(pdev)) {

		acpi_lpss_create_device_links(adev, pdev);

		return 1;

	if (IS_ERR_OR_NULL(pdev)) {

		adev->driver_data = NULL;

		ret = PTR_ERR(pdev);

		goto err_out;

	}



	ret = PTR_ERR(pdev);

	adev->driver_data = NULL;

	acpi_lpss_create_device_links(adev, pdev);

	return 1;



out_free:

	/* Skip the device, but continue the namespace scan */

	ret = 0;

err_out:

	kfree(pdata);

	return ret;