As the separate pmic_glink_altmode driver has been merged to the UCSI glink glue driver and the UCSI is now enabled on all platforms, drop separate altmode device support in the pmic_glink driver. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> --- drivers/soc/qcom/pmic_glink.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/soc/qcom/pmic_glink.c b/drivers/soc/qcom/pmic_glink.c index dcea33f93fae..680954334b7f 100644 --- a/drivers/soc/qcom/pmic_glink.c +++ b/drivers/soc/qcom/pmic_glink.c @@ -14,7 +14,6 @@ enum { PMIC_GLINK_CLIENT_BATT = 0, - PMIC_GLINK_CLIENT_ALTMODE, PMIC_GLINK_CLIENT_UCSI, }; @@ -26,7 +25,6 @@ struct pmic_glink { unsigned long client_mask; - struct auxiliary_device altmode_aux; struct auxiliary_device ps_aux; struct auxiliary_device ucsi_aux; @@ -294,15 +292,10 @@ static int pmic_glink_probe(struct platform_device *pdev) if (ret) goto out_release_pdr_handle; } - if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_ALTMODE)) { - ret = pmic_glink_add_aux_device(pg, &pg->altmode_aux, "altmode"); - if (ret) - goto out_release_ucsi_aux; - } if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_BATT)) { ret = pmic_glink_add_aux_device(pg, &pg->ps_aux, "power-supply"); if (ret) - goto out_release_altmode_aux; + goto out_release_ucsi_aux; } service = pdr_add_lookup(pg->pdr, "tms/servreg", "msm/adsp/charger_pd"); @@ -321,9 +314,6 @@ static int pmic_glink_probe(struct platform_device *pdev) out_release_aux_devices: if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_BATT)) pmic_glink_del_aux_device(pg, &pg->ps_aux); -out_release_altmode_aux: - if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_ALTMODE)) - pmic_glink_del_aux_device(pg, &pg->altmode_aux); out_release_ucsi_aux: if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_UCSI)) pmic_glink_del_aux_device(pg, &pg->ucsi_aux); @@ -341,8 +331,6 @@ static void pmic_glink_remove(struct platform_device *pdev) if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_BATT)) pmic_glink_del_aux_device(pg, &pg->ps_aux); - if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_ALTMODE)) - pmic_glink_del_aux_device(pg, &pg->altmode_aux); if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_UCSI)) pmic_glink_del_aux_device(pg, &pg->ucsi_aux); @@ -352,7 +340,6 @@ static void pmic_glink_remove(struct platform_device *pdev) } static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) | - BIT(PMIC_GLINK_CLIENT_ALTMODE) | BIT(PMIC_GLINK_CLIENT_UCSI); static const struct of_device_id pmic_glink_of_match[] = { -- 2.39.2