cgroup: convert all non-memcg controllers to the new cftype interface

[platform/adaptation/renesas_rcar/renesas_kernel.git] / block / blk-cgroup.c

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 60ef16d..126c341 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1515,14 +1515,9 @@ struct cftype blkio_files[] = {
                .read_map = blkiocg_file_read_map,
        },
 #endif
+       { }     /* terminate */
 };
 
-static int blkiocg_populate(struct cgroup_subsys *subsys, struct cgroup *cgroup)
-{
-       return cgroup_add_files(cgroup, subsys, blkio_files,
-                               ARRAY_SIZE(blkio_files));
-}
-
 static void blkiocg_destroy(struct cgroup *cgroup)
 {
        struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgroup);
@@ -1642,11 +1637,11 @@ struct cgroup_subsys blkio_subsys = {
        .can_attach = blkiocg_can_attach,
        .attach = blkiocg_attach,
        .destroy = blkiocg_destroy,
-       .populate = blkiocg_populate,
 #ifdef CONFIG_BLK_CGROUP
        /* note: blkio_subsys_id is otherwise defined in blk-cgroup.h */
        .subsys_id = blkio_subsys_id,
 #endif
+       .base_cftypes = blkio_files,
        .use_id = 1,
        .module = THIS_MODULE,
 };