Commit ce7793e9 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

pinctrl: baytrail: Switch to use intel_pinctrl_get_soc_data() 



Since we have common helper to retrieve SoC data from driver data
we may switch to use it.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent ff360d62

drivers/pinctrl/intel/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -6,11 +6,7 @@ if (X86 || COMPILE_TEST) 
config PINCTRL_BAYTRAIL

	bool "Intel Baytrail GPIO pin control"

	depends on ACPI

	select GPIOLIB

	select GPIOLIB_IRQCHIP

	select PINMUX

	select PINCONF

	select GENERIC_PINCONF

	select PINCTRL_INTEL

	help

	  driver for memory mapped GPIO functionality on Intel Baytrail

	  platforms. Supports 3 banks with 102, 28 and 44 gpios.

drivers/pinctrl/intel/pinctrl-baytrail.c

+5 −19
Original line number Diff line number Diff line
@@ -1635,28 +1635,14 @@ static const struct acpi_device_id byt_gpio_acpi_match[] = { 


static int byt_pinctrl_probe(struct platform_device *pdev)

{

	const struct intel_pinctrl_soc_data *soc_data = NULL;

	const struct intel_pinctrl_soc_data **soc_table;

	const struct intel_pinctrl_soc_data *soc_data;

	struct device *dev = &pdev->dev;

	struct acpi_device *acpi_dev;

	struct intel_pinctrl *vg;

	int i, ret;



	acpi_dev = ACPI_COMPANION(dev);

	if (!acpi_dev)

		return -ENODEV;



	soc_table = (const struct intel_pinctrl_soc_data **)device_get_match_data(dev);



	for (i = 0; soc_table[i]; i++) {

		if (!strcmp(acpi_dev->pnp.unique_id, soc_table[i]->uid)) {

			soc_data = soc_table[i];

			break;

		}

	}

	int ret;



	if (!soc_data)

		return -ENODEV;

	soc_data = intel_pinctrl_get_soc_data(pdev);

	if (IS_ERR(soc_data))

		return PTR_ERR(soc_data);



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

	if (!vg)

CRA Git | Maintained and supported by SUSTech CRA and CCSE