[Cbe-oss-dev] [RFC, PATCH 2/2] powerpc/spufs: consolidate contexts of normal and NOSCHED context directories

[Jeremy Kerr]

Now that we can call spu_acquire_saved on NOSCHED contexts, there's
no reason to restrict the set of files to those that require the
context to be saved.

Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

---
 arch/powerpc/platforms/cell/spufs/file.c  |   25 -------------------------
 arch/powerpc/platforms/cell/spufs/inode.c |    7 +------
 arch/powerpc/platforms/cell/spufs/spufs.h |    1 -
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 99c7306..2e8d9c7 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -2648,31 +2648,6 @@ struct spufs_tree_descr spufs_dir_contents[] = {
 	{},
 };
 
-struct spufs_tree_descr spufs_dir_nosched_contents[] = {
-	{ "capabilities", &spufs_caps_fops, 0444, },
-	{ "mem",  &spufs_mem_fops,  0666, LS_SIZE, },
-	{ "mbox", &spufs_mbox_fops, 0444, },
-	{ "ibox", &spufs_ibox_fops, 0444, },
-	{ "wbox", &spufs_wbox_fops, 0222, },
-	{ "mbox_stat", &spufs_mbox_stat_fops, 0444, sizeof(u32), },
-	{ "ibox_stat", &spufs_ibox_stat_fops, 0444, sizeof(u32), },
-	{ "wbox_stat", &spufs_wbox_stat_fops, 0444, sizeof(u32), },
-	{ "signal1", &spufs_signal1_nosched_fops, 0222, },
-	{ "signal2", &spufs_signal2_nosched_fops, 0222, },
-	{ "signal1_type", &spufs_signal1_type, 0666, },
-	{ "signal2_type", &spufs_signal2_type, 0666, },
-	{ "mss", &spufs_mss_fops, 0666, },
-	{ "mfc", &spufs_mfc_fops, 0666, },
-	{ "cntl", &spufs_cntl_fops,  0666, },
-	{ "npc", &spufs_npc_ops, 0666, },
-	{ "psmap", &spufs_psmap_fops, 0666, SPUFS_PS_MAP_SIZE, },
-	{ "phys-id", &spufs_id_ops, 0666, },
-	{ "object-id", &spufs_object_id_ops, 0666, },
-	{ "tid", &spufs_tid_fops, 0444, },
-	{ "stat", &spufs_stat_fops, 0444, },
-	{},
-};
-
 struct spufs_tree_descr spufs_dir_debug_contents[] = {
 	{ ".ctx", &spufs_ctx_fops, 0444, },
 	{},
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 7123472..1980bf4 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -280,12 +280,7 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
 	ctx->flags = flags;
 	inode->i_op = &simple_dir_inode_operations;
 	inode->i_fop = &simple_dir_operations;
-	if (flags & SPU_CREATE_NOSCHED)
-		ret = spufs_fill_dir(dentry, spufs_dir_nosched_contents,
-					 mode, ctx);
-	else
-		ret = spufs_fill_dir(dentry, spufs_dir_contents, mode, ctx);
-
+	ret = spufs_fill_dir(dentry, spufs_dir_contents, mode, ctx);
 	if (ret)
 		goto out_free_ctx;
 
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 8ae8ef9..c1e81c9 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -243,7 +243,6 @@ struct spufs_tree_descr {
 };
 
 extern struct spufs_tree_descr spufs_dir_contents[];
-extern struct spufs_tree_descr spufs_dir_nosched_contents[];
 extern struct spufs_tree_descr spufs_dir_debug_contents[];
 
 /* system call implementation */