Commit d58cd53d authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] timers: drivers/

The output from a second pass across the tree.  I visited all instances
of ".function" and "->function".  net/ has been sent to David.
parent 5ffdb206
......@@ -855,6 +855,7 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
}
priv = (struct dev_priv *) dev->priv;
init_timer(&priv->timer);
/* Reset card...
*/
......
......@@ -2148,9 +2148,9 @@ idt77252_init_est(struct vc_map *vc, int pcr)
est->interval = 2; /* XXX: make this configurable */
est->ewma_log = 2; /* XXX: make this configurable */
init_timer(&est->timer);
est->timer.data = (unsigned long)vc;
est->timer.function = idt77252_est_timer;
init_timer(&est->timer);
est->timer.expires = jiffies + ((HZ / 4) << est->interval);
add_timer(&est->timer);
......@@ -3745,9 +3745,9 @@ idt77252_init_one(struct pci_dev *pcidev, const struct pci_device_id *id)
spin_lock_init(&card->cmd_lock);
spin_lock_init(&card->tst_lock);
init_timer(&card->tst_timer);
card->tst_timer.data = (unsigned long)card;
card->tst_timer.function = tst_timer;
init_timer(&card->tst_timer);
/* Do the I/O remapping... */
card->membase = (unsigned long) ioremap(membase, 1024);
......
......@@ -849,6 +849,7 @@ dev_link_t *bluecard_attach(void)
link = &info->link;
link->priv = info;
init_timer(&link->release);
link->release.function = &bluecard_release;
link->release.data = (u_long)link;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
......
......@@ -643,6 +643,7 @@ dev_link_t *bt3c_attach(void)
link = &info->link;
link->priv = info;
init_timer(&link->release);
link->release.function = &bt3c_release;
link->release.data = (u_long)link;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
......
......@@ -582,6 +582,7 @@ dev_link_t *dtl1_attach(void)
link = &info->link;
link->priv = info;
init_timer(&link->release);
link->release.function = &dtl1_release;
link->release.data = (u_long)link;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
......
......@@ -1514,6 +1514,7 @@ int __init cm206_init(void)
memset(cd, 0, sizeof(*cd)); /* give'm some reasonable value */
cd->sector_last = -1; /* flag no data buffered */
cd->adapter_last = -1;
init_timer(&cd->timer);
cd->timer.function = cm206_timeout;
cd->max_sectors = (inw(r_data_status) & ds_ram_size) ? 24 : 97;
printk(KERN_INFO "%d kB adapter memory available, "
......
......@@ -582,6 +582,7 @@ static dev_link_t *mgslpc_attach(void)
link->priv = info;
/* Initialize the dev_link_t structure */
init_timer(&link->release);
link->release.function = &mgslpc_release;
link->release.data = (u_long)link;
......
......@@ -676,6 +676,7 @@ int fcp_forceoffline(fc_channel *fcchain, int count)
l.magic = LSOMAGIC;
FCND(("FCP Force Offline for %d channels\n", count))
init_MUTEX_LOCKED(&l.sem);
init_timer(&l.timer);
l.timer.function = fcp_login_timeout;
l.timer.data = (unsigned long)&l;
atomic_set (&l.todo, count);
......@@ -977,7 +978,7 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
fc->rst_pkt->eh_state = SCSI_STATE_QUEUED;
init_timer(&fc->rst_pkt->eh_timeout);
fc->rst_pkt->eh_timeout.data = (unsigned long) fc->rst_pkt;
fc->rst_pkt->eh_timeout.expires = jiffies + FCP_RESET_TIMEOUT;
fc->rst_pkt->eh_timeout.function = (void (*)(unsigned long))fcp_scsi_reset_done;
......
......@@ -134,6 +134,7 @@ static dev_link_t *ide_attach(void)
memset(info, 0, sizeof(*info));
link = &info->link; link->priv = info;
init_timer(&link->release);
link->release.function = &ide_release;
link->release.data = (u_long)link;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment