Re: [PATCH v4 10/32] ASoC: qcom: Add USB backend ASoC driver for Q6

+struct q6usb_port_data {

• struct q6afe_usb_cfg usb_cfg;
• struct snd_soc_usb *usb;
• struct q6usb_offload priv;
• int active_idx;

what is an 'active_idx' ?

+static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb, int card_idx,

• 	int connected)
  

+{

• struct snd_soc_dapm_context *dapm;
• struct q6usb_port_data *data;
• dapm = snd_soc_component_get_dapm(usb->component);
• data = dev_get_drvdata(usb->component->dev);

shouldn't you test that 'dapm' and 'data' are not NULL ?

• if (connected) {

this goes back to my earlier comment that you treat 'connected' as a boolean.

• snd_soc_dapm_enable_pin(dapm, "USB_RX_BE");
  

• /* We only track the latest USB headset plugged in */
  

• data->active_idx = card_idx;
  

• } else {

• snd_soc_dapm_disable_pin(dapm, "USB_RX_BE");
  

• }
• snd_soc_dapm_sync(dapm);
• return 0;

+}

+static int q6usb_component_probe(struct snd_soc_component *component) +{

• struct q6usb_port_data *data = dev_get_drvdata(component->dev);
• struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
• snd_soc_dapm_disable_pin(dapm, "USB_RX_BE");
• snd_soc_dapm_sync(dapm);
• data->usb = snd_soc_usb_add_port(component->dev, &data->priv, q6usb_alsa_connection_cb);
• if (IS_ERR(data->usb)) {

• dev_err(component->dev, "failed to add usb port\n");
  

• return -ENODEV;
  

• }
• data->usb->component = component;
• return 0;

+}

+static const struct snd_soc_component_driver q6usb_dai_component = {

• .probe = q6usb_component_probe,

erm, if you have a .probe that adds a port, don't you need a remove that removes the same port, and sets the pin state as well?

• .name = "q6usb-dai-component",
• .dapm_widgets = q6usb_dai_widgets,
• .num_dapm_widgets = ARRAY_SIZE(q6usb_dai_widgets),
• .dapm_routes = q6usb_dapm_routes,
• .num_dapm_routes = ARRAY_SIZE(q6usb_dapm_routes),
• .of_xlate_dai_name = q6usb_audio_ports_of_xlate_dai_name,

+};

+static int q6usb_dai_dev_probe(struct platform_device *pdev) +{

• struct device_node *node = pdev->dev.of_node;
• struct q6usb_port_data *data;
• struct device *dev = &pdev->dev;
• struct of_phandle_args args;
• int ret;
• data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
• if (!data)

• return -ENOMEM;
  

• ret = of_property_read_u32(node, "qcom,usb-audio-intr-num",

• 		&data->priv.intr_num);
  

• if (ret) {

• dev_err(&pdev->dev, "failed to read intr num.\n");
  

• return ret;
  

• }
• ret = of_parse_phandle_with_fixed_args(node, "iommus", 1, 0, &args);
• if (ret < 0)

• data->priv.sid = -1;
  

• else

• data->priv.sid = args.args[0] & SID_MASK;
  

• data->priv.domain = iommu_get_domain_for_dev(&pdev->dev);
• data->priv.dev = dev;
• dev_set_drvdata(dev, data);
• ret = devm_snd_soc_register_component(dev, &q6usb_dai_component,

• 			q6usb_be_dais, ARRAY_SIZE(q6usb_be_dais));
  

• if (ret < 0)

• return ret;
  

• return 0;

return devm_snd_soc_register_component

+}

+static int q6usb_dai_dev_remove(struct platform_device *pdev) +{

• snd_soc_usb_remove_port(&pdev->dev);

that seems wrong, the port is added in the component probe, not the platform device probe.

• return 0;

+}> +