diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-10-10 15:12:39 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-12-07 15:29:35 -0500 |
commit | 1ed891c6d49e97ebd3305d8c6213246a14f0800f (patch) | |
tree | 39c01d37a1d03decc671539f156e7308d463bb97 /drivers/ieee1394/hosts.c | |
parent | 5c37dcbe138ed3239c5e8b6c2626ce773a7cea2e (diff) |
ieee1394: coding style in hosts.c
Some 80-columns pedantry, and touch up of a // comment.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/hosts.c')
-rw-r--r-- | drivers/ieee1394/hosts.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c index 25573bad81e0..fbf17cfe79b0 100644 --- a/drivers/ieee1394/hosts.c +++ b/drivers/ieee1394/hosts.c | |||
@@ -44,9 +44,10 @@ static void delayed_reset_bus(struct work_struct *work) | |||
44 | 44 | ||
45 | CSR_SET_BUS_INFO_GENERATION(host->csr.rom, generation); | 45 | CSR_SET_BUS_INFO_GENERATION(host->csr.rom, generation); |
46 | if (csr1212_generate_csr_image(host->csr.rom) != CSR1212_SUCCESS) { | 46 | if (csr1212_generate_csr_image(host->csr.rom) != CSR1212_SUCCESS) { |
47 | /* CSR image creation failed, reset generation field and do not | 47 | /* CSR image creation failed. |
48 | * issue a bus reset. */ | 48 | * Reset generation field and do not issue a bus reset. */ |
49 | CSR_SET_BUS_INFO_GENERATION(host->csr.rom, host->csr.generation); | 49 | CSR_SET_BUS_INFO_GENERATION(host->csr.rom, |
50 | host->csr.generation); | ||
50 | return; | 51 | return; |
51 | } | 52 | } |
52 | 53 | ||
@@ -54,7 +55,8 @@ static void delayed_reset_bus(struct work_struct *work) | |||
54 | 55 | ||
55 | host->update_config_rom = 0; | 56 | host->update_config_rom = 0; |
56 | if (host->driver->set_hw_config_rom) | 57 | if (host->driver->set_hw_config_rom) |
57 | host->driver->set_hw_config_rom(host, host->csr.rom->bus_info_data); | 58 | host->driver->set_hw_config_rom(host, |
59 | host->csr.rom->bus_info_data); | ||
58 | 60 | ||
59 | host->csr.gen_timestamp[host->csr.generation] = jiffies; | 61 | host->csr.gen_timestamp[host->csr.generation] = jiffies; |
60 | hpsb_reset_bus(host, SHORT_RESET); | 62 | hpsb_reset_bus(host, SHORT_RESET); |
@@ -70,7 +72,8 @@ static int dummy_devctl(struct hpsb_host *h, enum devctl_cmd c, int arg) | |||
70 | return -1; | 72 | return -1; |
71 | } | 73 | } |
72 | 74 | ||
73 | static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command, unsigned long arg) | 75 | static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command, |
76 | unsigned long arg) | ||
74 | { | 77 | { |
75 | return -1; | 78 | return -1; |
76 | } | 79 | } |
@@ -151,7 +154,7 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, | |||
151 | init_timer(&h->timeout); | 154 | init_timer(&h->timeout); |
152 | h->timeout.data = (unsigned long) h; | 155 | h->timeout.data = (unsigned long) h; |
153 | h->timeout.function = abort_timedouts; | 156 | h->timeout.function = abort_timedouts; |
154 | h->timeout_interval = HZ / 20; // 50ms by default | 157 | h->timeout_interval = HZ / 20; /* 50ms, half of minimum SPLIT_TIMEOUT */ |
155 | 158 | ||
156 | h->topology_map = h->csr.topology_map + 3; | 159 | h->topology_map = h->csr.topology_map + 3; |
157 | h->speed_map = (u8 *)(h->csr.speed_map + 2); | 160 | h->speed_map = (u8 *)(h->csr.speed_map + 2); |
@@ -226,7 +229,8 @@ int hpsb_update_config_rom_image(struct hpsb_host *host) | |||
226 | if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 * HZ)) | 229 | if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 * HZ)) |
227 | /* Wait 60 seconds from the last time this generation number was | 230 | /* Wait 60 seconds from the last time this generation number was |
228 | * used. */ | 231 | * used. */ |
229 | reset_delay = (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies; | 232 | reset_delay = |
233 | (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies; | ||
230 | else | 234 | else |
231 | /* Wait 1 second in case some other code wants to change the | 235 | /* Wait 1 second in case some other code wants to change the |
232 | * Config ROM in the near future. */ | 236 | * Config ROM in the near future. */ |