1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/media/video/bt8xx/bttv-gpio.c b/drivers/media/video/bt8xx/bttv-gpio.c
index 84154c26f9c5..dce6dae5740e 100644
--- a/drivers/media/video/bt8xx/bttv-gpio.c
+++ b/drivers/media/video/bt8xx/bttv-gpio.c
@@ -106,11 +106,9 @@ int bttv_sub_add_device(struct bttv_core *core, char *name)
 
 int bttv_sub_del_devices(struct bttv_core *core)
 {
-        struct bttv_sub_device *sub;
-        struct list_head *item,*save;
+        struct bttv_sub_device *sub, *save;
 
-        list_for_each_safe(item,save,&core->subs) {
-                sub = list_entry(item,struct bttv_sub_device,list);
+        list_for_each_entry_safe(sub, save, &core->subs, list) {
                 list_del(&sub->list);
                 device_unregister(&sub->dev);
         }