.ncommunities = ARRAY_SIZE(lbg_communities),
 };
 
-static int lbg_pinctrl_probe(struct platform_device *pdev)
-{
-       return intel_pinctrl_probe(pdev, &lbg_soc_data);
-}
-
 static INTEL_PINCTRL_PM_OPS(lbg_pinctrl_pm_ops);
 
 static const struct acpi_device_id lbg_pinctrl_acpi_match[] = {
-       { "INT3536" },
+       { "INT3536", (kernel_ulong_t)&lbg_soc_data },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, lbg_pinctrl_acpi_match);
 
 static struct platform_driver lbg_pinctrl_driver = {
-       .probe = lbg_pinctrl_probe,
+       .probe = intel_pinctrl_probe_by_hid,
        .driver = {
                .name = "lewisburg-pinctrl",
                .acpi_match_table = lbg_pinctrl_acpi_match,