Commit c98a9667 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

pinctrl: cannonlake: Convert to use intel_pinctrl_probe_by_hid() 



Get rid of code duplication by converting to use intel_pinctrl_probe_by_hid().

No functional change intended.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 70c263c4

drivers/pinctrl/intel/pinctrl-cannonlake.c

+3 −10
Original line number Diff line number Diff line
@@ -7,10 +7,11 @@ 
 *          Mika Westerberg <mika.westerberg@linux.intel.com>

 */



#include <linux/acpi.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/pm.h>



#include <linux/pinctrl/pinctrl.h>



#include "pinctrl-intel.h"
@@ -828,15 +829,7 @@ MODULE_DEVICE_TABLE(acpi, cnl_pinctrl_acpi_match); 


static int cnl_pinctrl_probe(struct platform_device *pdev)

{

	const struct intel_pinctrl_soc_data *soc_data;

	const struct acpi_device_id *id;



	id = acpi_match_device(cnl_pinctrl_acpi_match, &pdev->dev);

	if (!id || !id->driver_data)

		return -ENODEV;



	soc_data = (const struct intel_pinctrl_soc_data *)id->driver_data;

	return intel_pinctrl_probe(pdev, soc_data);

	return intel_pinctrl_probe_by_hid(pdev);

}



static const struct dev_pm_ops cnl_pinctrl_pm_ops = {