static struct platform_driver madera_pin_driver = {
        .probe = madera_pin_probe,
-       .remove_new = madera_pin_remove,
+       .remove = madera_pin_remove,
        .driver = {
                .name = "madera-pinctrl",
        },
 
 
 static struct platform_driver chv_pinctrl_driver = {
        .probe = chv_pinctrl_probe,
-       .remove_new = chv_pinctrl_remove,
+       .remove = chv_pinctrl_remove,
        .driver = {
                .name = "cherryview-pinctrl",
                .pm = pm_sleep_ptr(&chv_pinctrl_pm_ops),
 
                .of_match_table = abx500_gpio_match,
        },
        .probe = abx500_gpio_probe,
-       .remove_new = abx500_gpio_remove,
+       .remove = abx500_gpio_remove,
 };
 
 static int __init abx500_gpio_init(void)
 
 #endif
        },
        .probe          = amd_gpio_probe,
-       .remove_new     = amd_gpio_remove,
+       .remove         = amd_gpio_remove,
 };
 
 module_platform_driver(amd_gpio_driver);
 
                .of_match_table = artpec6_pinctrl_match,
        },
        .probe = artpec6_pmx_probe,
-       .remove_new = artpec6_pmx_remove,
+       .remove = artpec6_pmx_remove,
 };
 
 static int __init artpec6_pmx_init(void)
 
 
 static struct platform_driver rockchip_pinctrl_driver = {
        .probe          = rockchip_pinctrl_probe,
-       .remove_new     = rockchip_pinctrl_remove,
+       .remove         = rockchip_pinctrl_remove,
        .driver = {
                .name   = "rockchip-pinctrl",
                .pm = &rockchip_pinctrl_dev_pm_ops,
 
 
 static struct platform_driver pcs_driver = {
        .probe          = pcs_probe,
-       .remove_new     = pcs_remove,
+       .remove         = pcs_remove,
        .driver = {
                .name           = DRIVER_NAME,
                .of_match_table = pcs_of_match,
 
                .pm = &stmfx_pinctrl_dev_pm_ops,
        },
        .probe = stmfx_pinctrl_probe,
-       .remove_new = stmfx_pinctrl_remove,
+       .remove = stmfx_pinctrl_remove,
 };
 module_platform_driver(stmfx_pinctrl_driver);
 
 
 
 static struct platform_driver tb10x_pinctrl_pdrv = {
        .probe   = tb10x_pinctrl_probe,
-       .remove_new = tb10x_pinctrl_remove,
+       .remove  = tb10x_pinctrl_remove,
        .driver  = {
                .name  = "tb10x_pinctrl",
                .of_match_table = of_match_ptr(tb10x_pinctrl_dt_ids),
 
                .of_match_table = apq8064_pinctrl_of_match,
        },
        .probe = apq8064_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init apq8064_pinctrl_init(void)
 
                .of_match_table = apq8084_pinctrl_of_match,
        },
        .probe = apq8084_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init apq8084_pinctrl_init(void)
 
                .of_match_table = ipq4019_pinctrl_of_match,
        },
        .probe = ipq4019_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init ipq4019_pinctrl_init(void)
 
                .of_match_table = ipq5018_pinctrl_of_match,
        },
        .probe = ipq5018_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init ipq5018_pinctrl_init(void)
 
                .of_match_table = ipq5332_pinctrl_of_match,
        },
        .probe = ipq5332_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init ipq5332_pinctrl_init(void)
 
                .of_match_table = ipq6018_pinctrl_of_match,
        },
        .probe = ipq6018_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init ipq6018_pinctrl_init(void)
 
                .of_match_table = ipq8064_pinctrl_of_match,
        },
        .probe = ipq8064_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init ipq8064_pinctrl_init(void)
 
                .of_match_table = ipq8074_pinctrl_of_match,
        },
        .probe = ipq8074_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init ipq8074_pinctrl_init(void)
 
                .of_match_table = ipq9574_pinctrl_of_match,
        },
        .probe = ipq9574_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init ipq9574_pinctrl_init(void)
 
                .of_match_table = mdm9607_pinctrl_of_match,
        },
        .probe = mdm9607_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init mdm9607_pinctrl_init(void)
 
                .of_match_table = mdm9615_pinctrl_of_match,
        },
        .probe = mdm9615_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init mdm9615_pinctrl_init(void)
 
                .of_match_table = msm8226_pinctrl_of_match,
        },
        .probe = msm8226_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8226_pinctrl_init(void)
 
                .of_match_table = msm8660_pinctrl_of_match,
        },
        .probe = msm8660_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8660_pinctrl_init(void)
 
                .of_match_table = msm8909_pinctrl_of_match,
        },
        .probe = msm8909_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8909_pinctrl_init(void)
 
                .of_match_table = msm8916_pinctrl_of_match,
        },
        .probe = msm8916_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8916_pinctrl_init(void)
 
                .of_match_table = msm8953_pinctrl_of_match,
        },
        .probe = msm8953_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8953_pinctrl_init(void)
 
                .of_match_table = msm8960_pinctrl_of_match,
        },
        .probe = msm8960_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8960_pinctrl_init(void)
 
                .of_match_table = msm8976_pinctrl_of_match,
        },
        .probe = msm8976_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8976_pinctrl_init(void)
 
                .of_match_table = msm8994_pinctrl_of_match,
        },
        .probe = msm8994_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8994_pinctrl_init(void)
 
                .of_match_table = msm8996_pinctrl_of_match,
        },
        .probe = msm8996_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8996_pinctrl_init(void)
 
                .of_match_table = msm8998_pinctrl_of_match,
        },
        .probe = msm8998_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8998_pinctrl_init(void)
 
                .of_match_table = msm8x74_pinctrl_of_match,
        },
        .probe = msm8x74_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init msm8x74_pinctrl_init(void)
 
                .of_match_table = qcm2290_pinctrl_of_match,
        },
        .probe = qcm2290_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init qcm2290_pinctrl_init(void)
 
                .of_match_table = qcs404_pinctrl_of_match,
        },
        .probe = qcs404_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init qcs404_pinctrl_init(void)
 
                .of_match_table = qcs615_tlmm_of_match,
        },
        .probe = qcs615_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init qcs615_tlmm_init(void)
 
                .acpi_match_table = qdf2xxx_acpi_ids,
        },
        .probe = qdf2xxx_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init qdf2xxx_pinctrl_init(void)
 
                .of_match_table = qdu1000_tlmm_of_match,
        },
        .probe = qdu1000_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init qdu1000_tlmm_init(void)
 
                .of_match_table = sa8775p_pinctrl_of_match,
        },
        .probe = sa8775p_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sa8775p_pinctrl_init(void)
 
                .of_match_table = sc7180_pinctrl_of_match,
        },
        .probe = sc7180_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sc7180_pinctrl_init(void)
 
                   .of_match_table = lpi_pinctrl_of_match,
        },
        .probe = lpi_pinctrl_probe,
-       .remove_new = lpi_pinctrl_remove,
+       .remove = lpi_pinctrl_remove,
 };
 
 module_platform_driver(lpi_pinctrl_driver);
 
                .of_match_table = sc7280_pinctrl_of_match,
        },
        .probe = sc7280_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sc7280_pinctrl_init(void)
 
                .acpi_match_table = sc8180x_pinctrl_acpi_match,
        },
        .probe = sc8180x_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sc8180x_pinctrl_init(void)
 
                   .of_match_table = lpi_pinctrl_of_match,
        },
        .probe = lpi_pinctrl_probe,
-       .remove_new = lpi_pinctrl_remove,
+       .remove = lpi_pinctrl_remove,
 };
 
 module_platform_driver(lpi_pinctrl_driver);
 
                .of_match_table = sc8280xp_pinctrl_of_match,
        },
        .probe = sc8280xp_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sc8280xp_pinctrl_init(void)
 
                .of_match_table = sdm660_pinctrl_of_match,
        },
        .probe = sdm660_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sdm660_pinctrl_init(void)
 
                .of_match_table = sdm670_pinctrl_of_match,
        },
        .probe = sdm670_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sdm670_pinctrl_init(void)
 
                .acpi_match_table = ACPI_PTR(sdm845_pinctrl_acpi_match),
        },
        .probe = sdm845_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sdm845_pinctrl_init(void)
 
                .of_match_table = sdx55_pinctrl_of_match,
        },
        .probe = sdx55_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sdx55_pinctrl_init(void)
 
                .of_match_table = sdx65_pinctrl_of_match,
        },
        .probe = sdx65_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sdx65_pinctrl_init(void)
 
                .of_match_table = sdx75_pinctrl_of_match,
        },
        .probe = sdx75_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sdx75_pinctrl_init(void)
 
                .of_match_table = lpi_pinctrl_of_match,
        },
        .probe = lpi_pinctrl_probe,
-       .remove_new = lpi_pinctrl_remove,
+       .remove = lpi_pinctrl_remove,
 };
 
 module_platform_driver(lpi_pinctrl_driver);
 
                .of_match_table = sm4450_tlmm_of_match,
        },
        .probe = sm4450_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 MODULE_DEVICE_TABLE(of, sm4450_tlmm_of_match);
 
 
                .of_match_table = lpi_pinctrl_of_match,
        },
        .probe = lpi_pinctrl_probe,
-       .remove_new = lpi_pinctrl_remove,
+       .remove = lpi_pinctrl_remove,
 };
 
 module_platform_driver(lpi_pinctrl_driver);
 
                .of_match_table = sm6115_tlmm_of_match,
        },
        .probe = sm6115_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm6115_tlmm_init(void)
 
                .of_match_table = sm6125_tlmm_of_match,
        },
        .probe = sm6125_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm6125_tlmm_init(void)
 
                .of_match_table = sm6350_tlmm_of_match,
        },
        .probe = sm6350_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm6350_tlmm_init(void)
 
                .of_match_table = sm6375_tlmm_of_match,
        },
        .probe = sm6375_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm6375_tlmm_init(void)
 
                .of_match_table = sm7150_tlmm_of_match,
        },
        .probe = sm7150_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm7150_tlmm_init(void)
 
                .of_match_table = sm8150_pinctrl_of_match,
        },
        .probe = sm8150_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm8150_pinctrl_init(void)
 
                   .of_match_table = lpi_pinctrl_of_match,
        },
        .probe = lpi_pinctrl_probe,
-       .remove_new = lpi_pinctrl_remove,
+       .remove = lpi_pinctrl_remove,
 };
 
 module_platform_driver(lpi_pinctrl_driver);
 
                .of_match_table = sm8250_pinctrl_of_match,
        },
        .probe = sm8250_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm8250_pinctrl_init(void)
 
                   .of_match_table = lpi_pinctrl_of_match,
        },
        .probe = lpi_pinctrl_probe,
-       .remove_new = lpi_pinctrl_remove,
+       .remove = lpi_pinctrl_remove,
 };
 module_platform_driver(lpi_pinctrl_driver);
 
 
                .of_match_table = sm8350_tlmm_of_match,
        },
        .probe = sm8350_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm8350_tlmm_init(void)
 
                   .of_match_table = lpi_pinctrl_of_match,
        },
        .probe = lpi_pinctrl_probe,
-       .remove_new = lpi_pinctrl_remove,
+       .remove = lpi_pinctrl_remove,
 };
 
 module_platform_driver(lpi_pinctrl_driver);
 
                .of_match_table = sm8450_tlmm_of_match,
        },
        .probe = sm8450_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm8450_tlmm_init(void)
 
                   .of_match_table = lpi_pinctrl_of_match,
        },
        .probe = lpi_pinctrl_probe,
-       .remove_new = lpi_pinctrl_remove,
+       .remove = lpi_pinctrl_remove,
 };
 
 module_platform_driver(lpi_pinctrl_driver);
 
                .of_match_table = sm8550_tlmm_of_match,
        },
        .probe = sm8550_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm8550_tlmm_init(void)
 
                   .of_match_table = lpi_pinctrl_of_match,
        },
        .probe = lpi_pinctrl_probe,
-       .remove_new = lpi_pinctrl_remove,
+       .remove = lpi_pinctrl_remove,
 };
 
 module_platform_driver(lpi_pinctrl_driver);
 
                .of_match_table = sm8650_tlmm_of_match,
        },
        .probe = sm8650_tlmm_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init sm8650_tlmm_init(void)
 
                   .of_match_table = pmic_gpio_of_match,
        },
        .probe  = pmic_gpio_probe,
-       .remove_new = pmic_gpio_remove,
+       .remove = pmic_gpio_remove,
 };
 
 module_platform_driver(pmic_gpio_driver);
 
                   .of_match_table = pmic_mpp_of_match,
        },
        .probe  = pmic_mpp_probe,
-       .remove_new = pmic_mpp_remove,
+       .remove = pmic_mpp_remove,
 };
 
 module_platform_driver(pmic_mpp_driver);
 
                .of_match_table = pm8xxx_gpio_of_match,
        },
        .probe = pm8xxx_gpio_probe,
-       .remove_new = pm8xxx_gpio_remove,
+       .remove = pm8xxx_gpio_remove,
 };
 
 module_platform_driver(pm8xxx_gpio_driver);
 
                .of_match_table = pm8xxx_mpp_of_match,
        },
        .probe = pm8xxx_mpp_probe,
-       .remove_new = pm8xxx_mpp_remove,
+       .remove = pm8xxx_mpp_remove,
 };
 
 module_platform_driver(pm8xxx_mpp_driver);
 
                .of_match_table = x1e80100_pinctrl_of_match,
        },
        .probe = x1e80100_pinctrl_probe,
-       .remove_new = msm_pinctrl_remove,
+       .remove = msm_pinctrl_remove,
 };
 
 static int __init x1e80100_pinctrl_init(void)
 
 
 static struct platform_driver rzn1_pinctrl_driver = {
        .probe  = rzn1_pinctrl_probe,
-       .remove_new = rzn1_pinctrl_remove,
+       .remove = rzn1_pinctrl_remove,
        .driver = {
                .name           = "rzn1-pinctrl",
                .of_match_table = rzn1_pinctrl_match,
 
                .of_match_table = sprd_pinctrl_of_match,
        },
        .probe = sprd_pinctrl_probe,
-       .remove_new = sprd_pinctrl_remove,
+       .remove = sprd_pinctrl_remove,
        .shutdown = sprd_pinctrl_shutdown,
 };
 module_platform_driver(sprd_pinctrl_driver);