From: Martin Peschke Small cleanup Signed-off-by: Martin Peschke Signed-off-by: Andrew Morton --- include/linux/statistic.h | 6 +++--- lib/statistic.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN include/linux/statistic.h~statistics-infrastructure-timer_stats-slimmed-down-statistics-prereq-cleanup include/linux/statistic.h --- a/include/linux/statistic.h~statistics-infrastructure-timer_stats-slimmed-down-statistics-prereq-cleanup +++ a/include/linux/statistic.h @@ -106,7 +106,7 @@ struct statistic { * @info: a struct statistic_info array describing the struct statistic array * @number: number of entries in both arrays * @pull: an optional function called when user reads data from file - * @pull_private: optional data pointer passed to pull function + * @private: optional data pointer reserved for use by clients * * Exploiters must setup a struct statistic_interface prior to calling * statistic_create(). @@ -121,8 +121,8 @@ struct statistic_interface { struct statistic *stat; struct statistic_info *info; int number; - int (*pull)(void*); - void *pull_private; + int (*pull)(struct statistic_interface *interface); + void *private; }; #ifdef CONFIG_STATISTICS diff -puN lib/statistic.c~statistics-infrastructure-timer_stats-slimmed-down-statistics-prereq-cleanup lib/statistic.c --- a/lib/statistic.c~statistics-infrastructure-timer_stats-slimmed-down-statistics-prereq-cleanup +++ a/lib/statistic.c @@ -663,7 +663,7 @@ static int statistic_open_data(struct in int size, i, j, retval = -ENOMEM; if (interface->pull) - interface->pull(interface->pull_private); + interface->pull(interface); size = interface->number * sizeof(struct statistic); seq_priv = kzalloc(sizeof(struct statistic_seq_private), GFP_KERNEL); _