Commit 610c9b6e authored by Joel Granados's avatar Joel Granados
Browse files

sysctl: Remove superfluous __do_proc_* indirection 



Remove "__" from __do_proc_do{intvec,uintvec,ulongvec_minmax} internal
functions and delete their corresponding do_proc_do* wrappers. These
indirections are unnecessary as they do not add extra logic nor do they
indicate a layer separation.

Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent ee581c0e

kernel/sysctl.c

+13 −39
Original line number Diff line number Diff line
@@ -398,11 +398,11 @@ static int do_proc_douintvec_conv(unsigned long *lvalp, 


static const char proc_wspace_sep[] = { ' ', '\t', '\n' };



static int __do_proc_dointvec(const struct ctl_table *table, int write,



static int do_proc_dointvec(const struct ctl_table *table, int write,

		  void *buffer, size_t *lenp, loff_t *ppos,

			      int (*conv)(bool *negp, unsigned long *lvalp,

					  int *valp, int write,

					  const struct ctl_table *table))

		  int (*conv)(bool *negp, unsigned long *lvalp, int *valp,

			      int write, const struct ctl_table *table))

{

	int *i, vleft, first = 1, err = 0;

	size_t left;
@@ -470,14 +470,6 @@ static int __do_proc_dointvec(const struct ctl_table *table, int write, 
	return err;

}



static int do_proc_dointvec(const struct ctl_table *table, int write,

		  void *buffer, size_t *lenp, loff_t *ppos,

		  int (*conv)(bool *negp, unsigned long *lvalp, int *valp,

			      int write, const struct ctl_table *table))

{

	return __do_proc_dointvec(table, write, buffer, lenp, ppos, conv);

}



static int do_proc_douintvec_w(const struct ctl_table *table, void *buffer,

			       size_t *lenp, loff_t *ppos,

			       int (*conv)(unsigned long *lvalp,
@@ -526,7 +518,6 @@ static int do_proc_douintvec_w(const struct ctl_table *table, void *buffer, 


	return 0;



	/* This is in keeping with old __do_proc_dointvec() */

bail_early:

	*ppos += *lenp;

	return err;
@@ -562,11 +553,10 @@ static int do_proc_douintvec_r(const struct ctl_table *table, void *buffer, 
	return err;

}



static int __do_proc_douintvec(const struct ctl_table *table, int write,

			       void *buffer, size_t *lenp, loff_t *ppos,

			       int (*conv)(unsigned long *lvalp,

					   unsigned int *valp, int write,

					   const struct ctl_table *table))

int do_proc_douintvec(const struct ctl_table *table, int write, void *buffer,

		      size_t *lenp, loff_t *ppos,

		      int (*conv)(unsigned long *lvalp, unsigned int *valp,

				  int write, const struct ctl_table *table))

{

	unsigned int vleft;
@@ -594,15 +584,6 @@ static int __do_proc_douintvec(const struct ctl_table *table, int write, 
	return do_proc_douintvec_r(table, buffer, lenp, ppos, conv);

}



int do_proc_douintvec(const struct ctl_table *table, int write,

		      void *buffer, size_t *lenp, loff_t *ppos,

		      int (*conv)(unsigned long *lvalp,

				  unsigned int *valp, int write,

				  const struct ctl_table *table))

{

	return __do_proc_douintvec(table, write, buffer, lenp, ppos, conv);

}



/**

 * proc_dobool - read/write a bool

 * @table: the sysctl table
@@ -831,9 +812,10 @@ int proc_dou8vec_minmax(const struct ctl_table *table, int write, 
}

EXPORT_SYMBOL_GPL(proc_dou8vec_minmax);



static int __do_proc_doulongvec_minmax(const struct ctl_table *table,

		int write, void *buffer, size_t *lenp, loff_t *ppos,

		unsigned long convmul, unsigned long convdiv)

static int do_proc_doulongvec_minmax(const struct ctl_table *table, int write,

				     void *buffer, size_t *lenp, loff_t *ppos,

				     unsigned long convmul,

				     unsigned long convdiv)

{

	unsigned long *i, *min, *max;

	int vleft, first = 1, err = 0;
@@ -904,14 +886,6 @@ static int __do_proc_doulongvec_minmax(const struct ctl_table *table, 
	return err;

}



static int do_proc_doulongvec_minmax(const struct ctl_table *table, int write,

		void *buffer, size_t *lenp, loff_t *ppos, unsigned long convmul,

		unsigned long convdiv)

{

	return __do_proc_doulongvec_minmax(table, write, buffer, lenp, ppos,

					   convmul, convdiv);

}



/**

 * proc_doulongvec_minmax - read a vector of long integers with min/max values

 * @table: the sysctl table