
9 Jul
2018
9 Jul
'18
9:48 a.m.
On 06-07-18, 15:13, Rohit kumar wrote:
+static void sdm845_init_supplies(struct device *dev) +{
- struct snd_soc_card *card = dev_get_drvdata(dev);
- struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card);
- data->vdd_supply = regulator_get(dev, "cdc-vdd");
- if (IS_ERR(data->vdd_supply)) {
dev_err(dev, "Unable to get regulator supplies\n");
data->vdd_supply = NULL;
return;
- }
- if (regulator_enable(data->vdd_supply))
dev_err(dev, "Unable to enable vdd supply\n");
+}
+static void sdm845_deinit_supplies(struct device *dev) +{
- struct snd_soc_card *card = dev_get_drvdata(dev);
- struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card);
- if (!data->vdd_supply)
return;
- regulator_disable(data->vdd_supply);
- regulator_put(data->vdd_supply);
+}
these two can be made generic, cant we make these common when we have supplies present?
+static int sdm845_bind(struct device *dev) +{
- struct snd_soc_card *card;
- struct sdm845_snd_data *data;
- int ret;
- card = kzalloc(sizeof(*card), GFP_KERNEL);
- if (!card)
return -ENOMEM;
- /* Allocate the private data */
- data = kzalloc(sizeof(*data), GFP_KERNEL);
- if (!data)
return -ENOMEM;
- ret = component_bind_all(dev, card);
- if (ret) {
dev_err(dev, "Audio components bind failed: %d\n", ret);
goto bind_fail;
- }
- dev_set_drvdata(dev, card);
- card->dev = dev;
- ret = qcom_snd_parse_of(card);
- if (ret) {
dev_err(dev, "Error parsing OF data\n");
goto parse_dt_fail;
- }
- data->card = card;
- snd_soc_card_set_drvdata(card, data);
- sdm845_add_be_ops(card);
- sdm845_init_supplies(dev);
- ret = snd_soc_register_card(card);
- if (ret) {
dev_err(dev, "Sound card registration failed\n");
goto register_card_fail;
- }
- return ret;
+register_card_fail:
- sdm845_deinit_supplies(dev);
- kfree(card->dai_link);
+parse_dt_fail:
- component_unbind_all(dev, card);
+bind_fail:
- kfree(data);
- kfree(card);
- return ret;
+}
I would make a case for this to be moved into common too :)
--
~Vinod