.ncommunities = ARRAY_SIZE(cdf_communities),
 };
 
-static int cdf_pinctrl_probe(struct platform_device *pdev)
-{
-       return intel_pinctrl_probe(pdev, &cdf_soc_data);
-}
-
 static INTEL_PINCTRL_PM_OPS(cdf_pinctrl_pm_ops);
 
 static const struct acpi_device_id cdf_pinctrl_acpi_match[] = {
-       { "INTC3001" },
+       { "INTC3001", (kernel_ulong_t)&cdf_soc_data },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, cdf_pinctrl_acpi_match);
 
 static struct platform_driver cdf_pinctrl_driver = {
-       .probe = cdf_pinctrl_probe,
+       .probe = intel_pinctrl_probe_by_hid,
        .driver = {
                .name = "cedarfork-pinctrl",
                .acpi_match_table = cdf_pinctrl_acpi_match,