1 files changed, 2 insertions, 8 deletions

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index c43a3323feea..442204cc22d9 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -447,22 +447,16 @@ static struct cftype dev_cgroup_files[] = {
                 .read_seq_string = devcgroup_seq_read,
                 .private = DEVCG_LIST,
         },
+        { }     /* terminate */
 };
 
-static int devcgroup_populate(struct cgroup_subsys *ss,
-                                struct cgroup *cgroup)
-{
-        return cgroup_add_files(cgroup, ss, dev_cgroup_files,
-                                        ARRAY_SIZE(dev_cgroup_files));
-}
-
 struct cgroup_subsys devices_subsys = {
         .name = "devices",
         .can_attach = devcgroup_can_attach,
         .create = devcgroup_create,
         .destroy = devcgroup_destroy,
-        .populate = devcgroup_populate,
         .subsys_id = devices_subsys_id,
+        .base_cftypes = dev_cgroup_files,
 };
 
 int __devcgroup_inode_permission(struct inode *inode, int mask)