Commit 54725958 authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Move proc_mckinley_root and proc_runway_root to sba_iommu 



Clean up the procfs root entries for gsc, runway, and mckinley busses.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent a4c59c9a

arch/parisc/kernel/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ pcxl_dma_init(void) 
	pcxl_res_map = (char *)__get_free_pages(GFP_KERNEL,

					    get_order(pcxl_res_size));

	memset(pcxl_res_map, 0, pcxl_res_size);

	proc_gsc_root = proc_mkdir("gsc", NULL);

	proc_gsc_root = proc_mkdir("bus/gsc", NULL);

	if (!proc_gsc_root)

    		printk(KERN_WARNING

			"pcxl_dma_init: Unable to create gsc /proc dir entry\n");

arch/parisc/kernel/setup.c

+0 −48
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ 


static char __initdata command_line[COMMAND_LINE_SIZE];



/* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */

struct proc_dir_entry * proc_runway_root __read_mostly = NULL;

struct proc_dir_entry * proc_gsc_root __read_mostly = NULL;

struct proc_dir_entry * proc_mckinley_root __read_mostly = NULL;



static void __init setup_cmdline(char **cmdline_p)

{

	extern unsigned int boot_args[];
@@ -196,48 +191,6 @@ const struct seq_operations cpuinfo_op = { 
	.show	= show_cpuinfo

};



static void __init parisc_proc_mkdir(void)

{

	/*

	** Can't call proc_mkdir() until after proc_root_init() has been

	** called by start_kernel(). In other words, this code can't

	** live in arch/.../setup.c because start_parisc() calls

	** start_kernel().

	*/

	switch (boot_cpu_data.cpu_type) {

	case pcxl:

	case pcxl2:

		if (NULL == proc_gsc_root)

		{

			proc_gsc_root = proc_mkdir("bus/gsc", NULL);

		}

		break;

        case pcxt_:

        case pcxu:

        case pcxu_:

        case pcxw:

        case pcxw_:

        case pcxw2:

                if (NULL == proc_runway_root)

                {

                        proc_runway_root = proc_mkdir("bus/runway", NULL);

                }

                break;

	case mako:

	case mako2:

                if (NULL == proc_mckinley_root)

                {

                        proc_mckinley_root = proc_mkdir("bus/mckinley", NULL);

                }

                break;

	default:

		/* FIXME: this was added to prevent the compiler 

		 * complaining about missing pcx, pcxs and pcxt

		 * I'm assuming they have neither gsc nor runway */

		break;

	}

}



static struct resource central_bus = {

	.name	= "Central Bus",

	.start	= F_EXTEND(0xfff80000),
@@ -294,7 +247,6 @@ static int __init parisc_init(void) 
{

	u32 osid = (OS_ID_LINUX << 16);



	parisc_proc_mkdir();

	parisc_init_resources();

	do_device_inventory();                  /* probe for hardware */

drivers/parisc/sba_iommu.c

+6 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ module_param(sba_reserve_agpgart, int, 0444); 
MODULE_PARM_DESC(sba_reserve_agpgart, "Reserve half of IO pdir as AGPGART");

#endif



struct proc_dir_entry *proc_runway_root __ro_after_init;

struct proc_dir_entry *proc_mckinley_root __ro_after_init;



/************************************

** SBA register read and write support
@@ -1968,11 +1970,15 @@ static int __init sba_driver_callback(struct parisc_device *dev) 
#ifdef CONFIG_PROC_FS

	switch (dev->id.hversion) {

	case PLUTO_MCKINLEY_PORT:

		if (!proc_mckinley_root)

			proc_mckinley_root = proc_mkdir("bus/mckinley", NULL);

		root = proc_mckinley_root;

		break;

	case ASTRO_RUNWAY_PORT:

	case IKE_MERCED_PORT:

	default:

		if (!proc_runway_root)

			proc_runway_root = proc_mkdir("bus/runway", NULL);

		root = proc_runway_root;

		break;

	}