]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
pinctrl: icelake: 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-icelake.c

index f33a5deafb97f68b5d6beeab04c9c45288d90e39..592b6edb322e48b9ca9bef3bab43809a65cc88dd 100644 (file)
@@ -403,21 +403,16 @@ static const struct intel_pinctrl_soc_data icllp_soc_data = {
        .ncommunities = ARRAY_SIZE(icllp_communities),
 };
 
-static int icl_pinctrl_probe(struct platform_device *pdev)
-{
-       return intel_pinctrl_probe(pdev, &icllp_soc_data);
-}
-
 static INTEL_PINCTRL_PM_OPS(icl_pinctrl_pm_ops);
 
 static const struct acpi_device_id icl_pinctrl_acpi_match[] = {
-       { "INT3455" },
+       { "INT3455", (kernel_ulong_t)&icllp_soc_data },
        { },
 };
 MODULE_DEVICE_TABLE(acpi, icl_pinctrl_acpi_match);
 
 static struct platform_driver icl_pinctrl_driver = {
-       .probe = icl_pinctrl_probe,
+       .probe = intel_pinctrl_probe_by_hid,
        .driver = {
                .name = "icelake-pinctrl",
                .acpi_match_table = icl_pinctrl_acpi_match,