*
  * @dev: The device to unregister
  */
-static int __snd_soc_unregister_component(struct device *dev)
+void snd_soc_unregister_component(struct device *dev)
 {
        struct snd_soc_component *component;
-       int found = 0;
 
        mutex_lock(&client_mutex);
-       for_each_component(component) {
-               if (dev != component->dev)
-                       continue;
+       while (1) {
+               component = snd_soc_lookup_component(dev, NULL);
+               if (!component)
+                       break;
 
                snd_soc_del_component_unlocked(component);
-               found = 1;
-               break;
        }
        mutex_unlock(&client_mutex);
-
-       return found;
-}
-
-void snd_soc_unregister_component(struct device *dev)
-{
-       while (__snd_soc_unregister_component(dev))
-               ;
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_component);