IB/hfi1: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Switches test of .data field to .function, since .data will be going away. Cc: Mike Marciniszyn <mike.marciniszyn@intel.com> Cc: Dennis Dalessandro <dennis.dalessandro@intel.com> Cc: Doug Ledford <dledford@redhat.com> Cc: Sean Hefty <sean.hefty@intel.com> Cc: Hal Rosenstock <hal.rosenstock@gmail.com> Cc: linux-rdma@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Doug Ledford <dledford@redhat.com>
このコミットが含まれているのは:
@@ -1252,9 +1252,9 @@ void shutdown_led_override(struct hfi1_pportdata *ppd)
|
||||
write_csr(dd, DCC_CFG_LED_CNTRL, 0);
|
||||
}
|
||||
|
||||
static void run_led_override(unsigned long opaque)
|
||||
static void run_led_override(struct timer_list *t)
|
||||
{
|
||||
struct hfi1_pportdata *ppd = (struct hfi1_pportdata *)opaque;
|
||||
struct hfi1_pportdata *ppd = from_timer(ppd, t, led_override_timer);
|
||||
struct hfi1_devdata *dd = ppd->dd;
|
||||
unsigned long timeout;
|
||||
int phase_idx;
|
||||
@@ -1298,8 +1298,7 @@ void hfi1_start_led_override(struct hfi1_pportdata *ppd, unsigned int timeon,
|
||||
* timeout so the handler will be called soon to look at our request.
|
||||
*/
|
||||
if (!timer_pending(&ppd->led_override_timer)) {
|
||||
setup_timer(&ppd->led_override_timer, run_led_override,
|
||||
(unsigned long)ppd);
|
||||
timer_setup(&ppd->led_override_timer, run_led_override, 0);
|
||||
ppd->led_override_timer.expires = jiffies + 1;
|
||||
add_timer(&ppd->led_override_timer);
|
||||
atomic_set(&ppd->led_override_timer_active, 1);
|
||||
|
新しいイシューから参照
ユーザーをブロックする