Merge branch 'linus' into core/objtool, to pick up dependent commits

[sfrench/cifs-2.6.git] / drivers / scsi / isci / host.c

diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 609dafd661d1437a0287c7511d8e31f7c1e1c199..13b37cdffa8edbf02ce56a09e40a80ff1c7cc5f7 100644 (file)
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -958,9 +958,9 @@ static enum sci_status sci_controller_start_next_phy(struct isci_host *ihost)
        return status;
 }
 
-static void phy_startup_timeout(unsigned long data)
+static void phy_startup_timeout(struct timer_list *t)
 {
-       struct sci_timer *tmr = (struct sci_timer *)data;
+       struct sci_timer *tmr = from_timer(tmr, t, timer);
        struct isci_host *ihost = container_of(tmr, typeof(*ihost), phy_timer);
        unsigned long flags;
        enum sci_status status;
@@ -1592,9 +1592,9 @@ static const struct sci_base_state sci_controller_state_table[] = {
        [SCIC_FAILED] = {}
 };
 
-static void controller_timeout(unsigned long data)
+static void controller_timeout(struct timer_list *t)
 {
-       struct sci_timer *tmr = (struct sci_timer *)data;
+       struct sci_timer *tmr = from_timer(tmr, t, timer);
        struct isci_host *ihost = container_of(tmr, typeof(*ihost), timer);
        struct sci_base_state_machine *sm = &ihost->sm;
        unsigned long flags;
@@ -1737,9 +1737,9 @@ static u8 max_spin_up(struct isci_host *ihost)
                             MAX_CONCURRENT_DEVICE_SPIN_UP_COUNT);
 }
 
-static void power_control_timeout(unsigned long data)
+static void power_control_timeout(struct timer_list *t)
 {
-       struct sci_timer *tmr = (struct sci_timer *)data;
+       struct sci_timer *tmr = from_timer(tmr, t, timer);
        struct isci_host *ihost = container_of(tmr, typeof(*ihost), power_control.timer);
        struct isci_phy *iphy;
        unsigned long flags;