OSDN Git Service

pinctrl: denverton: Get rid of unneeded ->probe() stub
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 4 Oct 2018 15:15:54 +0000 (18:15 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 8 Nov 2018 15:16:39 +0000 (17:16 +0200)
The local ->probe() stub does nothing except calling
a generic Intel pin control probe function. Thus,
it's not needed and generic function may be called directly.

Convert the driver accordingly.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
drivers/pinctrl/intel/pinctrl-denverton.c

index 88bc552..07171bc 100644 (file)
@@ -257,21 +257,16 @@ static const struct intel_pinctrl_soc_data dnv_soc_data = {
        .ncommunities = ARRAY_SIZE(dnv_communities),
 };
 
-static int dnv_pinctrl_probe(struct platform_device *pdev)
-{
-       return intel_pinctrl_probe(pdev, &dnv_soc_data);
-}
-
 static INTEL_PINCTRL_PM_OPS(dnv_pinctrl_pm_ops);
 
 static const struct acpi_device_id dnv_pinctrl_acpi_match[] = {
-       { "INTC3000" },
+       { "INTC3000", (kernel_ulong_t)&dnv_soc_data },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, dnv_pinctrl_acpi_match);
 
 static struct platform_driver dnv_pinctrl_driver = {
-       .probe = dnv_pinctrl_probe,
+       .probe = intel_pinctrl_probe_by_hid,
        .driver = {
                .name = "denverton-pinctrl",
                .acpi_match_table = dnv_pinctrl_acpi_match,