static int create_extcon_class(void)
 {
-       if (!extcon_class) {
-               extcon_class = class_create("extcon");
-               if (IS_ERR(extcon_class))
-                       return PTR_ERR(extcon_class);
-               extcon_class->dev_groups = extcon_groups;
-       }
+       if (extcon_class)
+               return 0;
+
+       extcon_class = class_create("extcon");
+       if (IS_ERR(extcon_class))
+               return PTR_ERR(extcon_class);
+       extcon_class->dev_groups = extcon_groups;
 
        return 0;
 }
        int ret, index = 0;
        static atomic_t edev_no = ATOMIC_INIT(-1);
 
-       if (!extcon_class) {
-               ret = create_extcon_class();
-               if (ret < 0)
-                       return ret;
-       }
+       ret = create_extcon_class();
+       if (ret < 0)
+               return ret;
 
        if (!edev || !edev->supported_cable)
                return -EINVAL;