On 2019-07-05 06:26, Cheng-Yi Chiang wrote:
+static void hdmi_codec_jack_report(struct hdmi_codec_priv *hcp,
+                                  unsigned int jack_status)
+{
+       if (!hcp->jack)
+               return;
+
+       if (jack_status != hcp->jack_status) {
+               snd_soc_jack_report(hcp->jack, jack_status, SND_JACK_LINEOUT);
+               hcp->jack_status = jack_status;
+       }
+}

Single "if" statement instead? The first "if" does not even cover all cases - if the secondary check fails, you'll "return;" too.

+/**
+ * hdmi_codec_set_jack_detect - register HDMI plugged callback
+ * @component: the hdmi-codec instance
+ * @jack: ASoC jack to report (dis)connection events on
+ */
+int hdmi_codec_set_jack_detect(struct snd_soc_component *component,
+                              struct snd_soc_jack *jack)
+{
+       struct hdmi_codec_priv *hcp = snd_soc_component_get_drvdata(component);
+       int ret;
+
+       if (hcp->hcd.ops->hook_plugged_cb) {
+               hcp->jack = jack;
+               ret = hcp->hcd.ops->hook_plugged_cb(component->dev->parent,
+                                                   hcp->hcd.data,
+                                                   plugged_cb);
+               if (ret) {
+                       hcp->jack = NULL;
+                       return ret;
+               }
+               return 0;
+       }
+       return -EOPNOTSUPP;
+}
+EXPORT_SYMBOL_GPL(hdmi_codec_set_jack_detect);

int ret = -EOPNOTSUPP;
(...)

return ret;

In consequence, you can reduce the number of "return(s)" and also remove the redundant parenthesis for the if-statement used to set jack to NULL.

Czarek
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to