Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf626b0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull procfs updates from Al Viro:
 "Christoph's proc_create_... cleanups series"

* 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (44 commits)
  xfs, proc: hide unused xfs procfs helpers
  isdn/gigaset: add back gigaset_procinfo assignment
  proc: update SIZEOF_PDE_INLINE_NAME for the new pde fields
  tty: replace ->proc_fops with ->proc_show
  ide: replace ->proc_fops with ->proc_show
  ide: remove ide_driver_proc_write
  isdn: replace ->proc_fops with ->proc_show
  atm: switch to proc_create_seq_private
  atm: simplify procfs code
  bluetooth: switch to proc_create_seq_data
  netfilter/x_tables: switch to proc_create_seq_private
  netfilter/xt_hashlimit: switch to proc_create_{seq,single}_data
  neigh: switch to proc_create_seq_data
  hostap: switch to proc_create_{seq,single}_data
  bonding: switch to proc_create_seq_data
  rtc/proc: switch to proc_create_single_data
  drbd: switch to proc_create_single
  resource: switch to proc_create_seq_data
  staging/rtl8192u: simplify procfs code
  jfs: simplify procfs code
  ...
parents 9c50eafc 5ef03dbd

arch/arm/kernel/dma.c

+1 −13
Original line number Original line Diff line number Diff line
@@ -276,21 +276,9 @@ static int proc_dma_show(struct seq_file *m, void *v) 
	return 0;

	return 0;

}

}





static int proc_dma_open(struct inode *inode, struct file *file)

{

	return single_open(file, proc_dma_show, NULL);

}



static const struct file_operations proc_dma_operations = {

	.open		= proc_dma_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};



static int __init proc_dma_init(void)

static int __init proc_dma_init(void)

{

{

	proc_create("dma", 0, NULL, &proc_dma_operations);

	proc_create_single("dma", 0, NULL, proc_dma_show);

	return 0;

	return 0;

}

}

arch/arm/kernel/swp_emulate.c

+2 −13
Original line number Original line Diff line number Diff line
@@ -91,18 +91,6 @@ static int proc_status_show(struct seq_file *m, void *v) 
		seq_printf(m, "Last process:\t\t%d\n", previous_pid);

		seq_printf(m, "Last process:\t\t%d\n", previous_pid);

	return 0;

	return 0;

}

}



static int proc_status_open(struct inode *inode, struct file *file)

{

	return single_open(file, proc_status_show, PDE_DATA(inode));

}



static const struct file_operations proc_status_fops = {

	.open		= proc_status_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};

#endif

#endif





/*

/*
@@ -260,7 +248,8 @@ static int __init swp_emulation_init(void) 
		return 0;

		return 0;





#ifdef CONFIG_PROC_FS

#ifdef CONFIG_PROC_FS

	if (!proc_create("cpu/swp_emulation", S_IRUGO, NULL, &proc_status_fops))

	if (!proc_create_single("cpu/swp_emulation", S_IRUGO, NULL,

			proc_status_show))

		return -ENOMEM;

		return -ENOMEM;

#endif /* CONFIG_PROC_FS */

#endif /* CONFIG_PROC_FS */

arch/arm/mach-rpc/ecard.c

+2 −14
Original line number Original line Diff line number Diff line
@@ -657,25 +657,13 @@ static int ecard_devices_proc_show(struct seq_file *m, void *v) 
	return 0;

	return 0;

}

}





static int ecard_devices_proc_open(struct inode *inode, struct file *file)

{

	return single_open(file, ecard_devices_proc_show, NULL);

}



static const struct file_operations bus_ecard_proc_fops = {

	.owner		= THIS_MODULE,

	.open		= ecard_devices_proc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};



static struct proc_dir_entry *proc_bus_ecard_dir = NULL;

static struct proc_dir_entry *proc_bus_ecard_dir = NULL;





static void ecard_proc_init(void)

static void ecard_proc_init(void)

{

{

	proc_bus_ecard_dir = proc_mkdir("bus/ecard", NULL);

	proc_bus_ecard_dir = proc_mkdir("bus/ecard", NULL);

	proc_create("devices", 0, proc_bus_ecard_dir, &bus_ecard_proc_fops);

	proc_create_single("devices", 0, proc_bus_ecard_dir,

			ecard_devices_proc_show);

}

}





#define ec_set_resource(ec,nr,st,sz)				\

#define ec_set_resource(ec,nr,st,sz)				\

arch/ia64/hp/common/sba_iommu.c

+1 −14
Original line number Original line Diff line number Diff line
@@ -1942,19 +1942,6 @@ static const struct seq_operations ioc_seq_ops = { 
	.show  = ioc_show

	.show  = ioc_show

};

};





static int

ioc_open(struct inode *inode, struct file *file)

{

	return seq_open(file, &ioc_seq_ops);

}



static const struct file_operations ioc_fops = {

	.open    = ioc_open,

	.read    = seq_read,

	.llseek  = seq_lseek,

	.release = seq_release

};



static void __init

static void __init

ioc_proc_init(void)

ioc_proc_init(void)

{

{
@@ -1964,7 +1951,7 @@ ioc_proc_init(void) 
	if (!dir)

	if (!dir)

		return;

		return;





	proc_create(ioc_list->name, 0, dir, &ioc_fops);

	proc_create_seq(ioc_list->name, 0, dir, &ioc_seq_ops);

}

}

#endif

#endif

arch/ia64/hp/sim/simserial.c

+1 −14
Original line number Original line Diff line number Diff line
@@ -435,19 +435,6 @@ static int rs_proc_show(struct seq_file *m, void *v) 
	return 0;

	return 0;

}

}





static int rs_proc_open(struct inode *inode, struct file *file)

{

	return single_open(file, rs_proc_show, NULL);

}



static const struct file_operations rs_proc_fops = {

	.owner		= THIS_MODULE,

	.open		= rs_proc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};



static const struct tty_operations hp_ops = {

static const struct tty_operations hp_ops = {

	.open = rs_open,

	.open = rs_open,

	.close = rs_close,

	.close = rs_close,
@@ -462,7 +449,7 @@ static const struct tty_operations hp_ops = { 
	.unthrottle = rs_unthrottle,

	.unthrottle = rs_unthrottle,

	.send_xchar = rs_send_xchar,

	.send_xchar = rs_send_xchar,

	.hangup = rs_hangup,

	.hangup = rs_hangup,

	.proc_fops = &rs_proc_fops,

	.proc_show = rs_proc_show,

};

};





static const struct tty_port_operations hp_port_ops = {

static const struct tty_port_operations hp_port_ops = {