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

Commit 3c557df6 authored by Kees Cook's avatar Kees Cook Committed by Thomas Gleixner
Browse files

timer: Remove meaningless .data/.function assignments 



Several timer users needlessly reset their .function/.data fields during
their timer callback, but nothing else changes them. Some users do not
use their .data field at all. Each instance is removed here.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> # for staging
Acked-by: Krzysztof Halasa <khc@pm.waw.pl> # for wan/hdlc*
Acked-by: Jens Axboe <axboe@kernel.dk> # for amiflop
Cc: devel@driverdev.osuosl.org
Cc: netdev@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Cc: Jens Axboe <axboe@fb.com>
Cc: Ganesh Krishna <ganesh.krishna@microchip.com>
Cc: Aditya Shankar <aditya.shankar@microchip.com>
Link: https://lkml.kernel.org/r/20171010001032.GA119829@beast
parent 4eb1bca1

drivers/block/amiflop.c

+1 −2
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static void fd_deselect (int drive) 


}



static void motor_on_callback(unsigned long nr)

static void motor_on_callback(unsigned long ignored)

{

	if (!(ciaa.pra & DSKRDY) || --on_attempts == 0) {

		complete_all(&motor_on_completion);
@@ -344,7 +344,6 @@ static int fd_motor_on(int nr) 
		fd_select(nr);



		reinit_completion(&motor_on_completion);

		motor_on_timer.data = nr;

		mod_timer(&motor_on_timer, jiffies + HZ/2);



		on_attempts = 10;

drivers/net/wan/hdlc_cisco.c

+0 −2
Original line number Diff line number Diff line
@@ -276,8 +276,6 @@ static void cisco_timer(unsigned long arg) 
	spin_unlock(&st->lock);



	st->timer.expires = jiffies + st->settings.interval * HZ;

	st->timer.function = cisco_timer;

	st->timer.data = arg;

	add_timer(&st->timer);

}

drivers/net/wan/hdlc_fr.c

+0 −2
Original line number Diff line number Diff line
@@ -644,8 +644,6 @@ static void fr_timer(unsigned long arg) 
			state(hdlc)->settings.t391 * HZ;

	}



	state(hdlc)->timer.function = fr_timer;

	state(hdlc)->timer.data = arg;

	add_timer(&state(hdlc)->timer);

}

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+1 −3
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static void update_scan_time(void) 
		last_scanned_shadow[i].time_scan = jiffies;

}



static void remove_network_from_shadow(unsigned long arg)

static void remove_network_from_shadow(unsigned long unused)

{

	unsigned long now = jiffies;

	int i, j;
@@ -287,7 +287,6 @@ static void remove_network_from_shadow(unsigned long arg) 
	}



	if (last_scanned_cnt != 0) {

		hAgingTimer.data = arg;

		mod_timer(&hAgingTimer, jiffies + msecs_to_jiffies(AGING_TIME));

	}

}
@@ -304,7 +303,6 @@ static int is_network_in_shadow(struct network_info *pstrNetworkInfo, 
	int i;



	if (last_scanned_cnt == 0) {

		hAgingTimer.data = (unsigned long)user_void;

		mod_timer(&hAgingTimer, jiffies + msecs_to_jiffies(AGING_TIME));

		state = -1;

	} else {