Skip to content

Commit

Permalink
extcon: Remove porting compatibility of swich class
Browse files Browse the repository at this point in the history
This patch removes the porting compatibility for switch class
because there is no any usage and requirement of swich class
over a couple of years.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
  • Loading branch information
chanwoochoi committed Apr 6, 2017
1 parent db0f3ba commit c9d0f1d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 143 deletions.
123 changes: 0 additions & 123 deletions Documentation/extcon/porting-android-switch-class

This file was deleted.

20 changes: 0 additions & 20 deletions drivers/extcon/extcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,6 @@ struct extcon_cable {
};

static struct class *extcon_class;
#if defined(CONFIG_ANDROID)
static struct class_compat *switch_class;
#endif /* CONFIG_ANDROID */

static LIST_HEAD(extcon_dev_list);
static DEFINE_MUTEX(extcon_dev_list_lock);
Expand Down Expand Up @@ -1032,12 +1029,6 @@ static int create_extcon_class(void)
if (IS_ERR(extcon_class))
return PTR_ERR(extcon_class);
extcon_class->dev_groups = extcon_groups;

#if defined(CONFIG_ANDROID)
switch_class = class_compat_register("switch");
if (WARN(!switch_class, "cannot allocate"))
return -ENOMEM;
#endif /* CONFIG_ANDROID */
}

return 0;
Expand Down Expand Up @@ -1259,10 +1250,6 @@ int extcon_dev_register(struct extcon_dev *edev)
put_device(&edev->dev);
goto err_dev;
}
#if defined(CONFIG_ANDROID)
if (switch_class)
ret = class_compat_create_link(switch_class, &edev->dev, NULL);
#endif /* CONFIG_ANDROID */

spin_lock_init(&edev->lock);

Expand Down Expand Up @@ -1350,10 +1337,6 @@ void extcon_dev_unregister(struct extcon_dev *edev)
kfree(edev->cables);
}

#if defined(CONFIG_ANDROID)
if (switch_class)
class_compat_remove_link(switch_class, &edev->dev, NULL);
#endif
put_device(&edev->dev);
}
EXPORT_SYMBOL_GPL(extcon_dev_unregister);
Expand Down Expand Up @@ -1424,9 +1407,6 @@ module_init(extcon_class_init);

static void __exit extcon_class_exit(void)
{
#if defined(CONFIG_ANDROID)
class_compat_unregister(switch_class);
#endif
class_destroy(extcon_class);
}
module_exit(extcon_class_exit);
Expand Down

0 comments on commit c9d0f1d

Please sign in to comment.