From: Stefan Richter <stefanr@s5r6.in-berlin.de>
To: linux1394-devel@lists.sourceforge.net
Cc: Jeff Garzik <jeff@garzik.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 2.6.19-rc1 2/3] ieee1394: coding style in hosts.c
Date: Tue, 10 Oct 2006 21:12:39 +0200 (CEST) [thread overview]
Message-ID: <tkrat.1904a2df7d282ffa@s5r6.in-berlin.de> (raw)
In-Reply-To: <tkrat.f3f45c410340f9b2@s5r6.in-berlin.de>
Some 80-columns pedantry, and touch up of a // comment.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
Index: linux-2.6.19-rc1/drivers/ieee1394/hosts.c
===================================================================
--- linux-2.6.19-rc1.orig/drivers/ieee1394/hosts.c 2006-10-10 19:07:36.000000000 +0200
+++ linux-2.6.19-rc1/drivers/ieee1394/hosts.c 2006-10-10 19:31:37.000000000 +0200
@@ -43,9 +43,10 @@ static void delayed_reset_bus(void * __r
CSR_SET_BUS_INFO_GENERATION(host->csr.rom, generation);
if (csr1212_generate_csr_image(host->csr.rom) != CSR1212_SUCCESS) {
- /* CSR image creation failed, reset generation field and do not
- * issue a bus reset. */
- CSR_SET_BUS_INFO_GENERATION(host->csr.rom, host->csr.generation);
+ /* CSR image creation failed.
+ * Reset generation field and do not issue a bus reset. */
+ CSR_SET_BUS_INFO_GENERATION(host->csr.rom,
+ host->csr.generation);
return;
}
@@ -53,7 +54,8 @@ static void delayed_reset_bus(void * __r
host->update_config_rom = 0;
if (host->driver->set_hw_config_rom)
- host->driver->set_hw_config_rom(host, host->csr.rom->bus_info_data);
+ host->driver->set_hw_config_rom(host,
+ host->csr.rom->bus_info_data);
host->csr.gen_timestamp[host->csr.generation] = jiffies;
hpsb_reset_bus(host, SHORT_RESET);
@@ -69,7 +71,8 @@ static int dummy_devctl(struct hpsb_host
return -1;
}
-static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command, unsigned long arg)
+static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command,
+ unsigned long arg)
{
return -1;
}
@@ -150,7 +151,7 @@ struct hpsb_host *hpsb_alloc_host(struct
init_timer(&h->timeout);
h->timeout.data = (unsigned long) h;
h->timeout.function = abort_timedouts;
- h->timeout_interval = HZ / 20; // 50ms by default
+ h->timeout_interval = HZ / 20; /* 50ms, half of minimum SPLIT_TIMEOUT */
h->topology_map = h->csr.topology_map + 3;
h->speed_map = (u8 *)(h->csr.speed_map + 2);
@@ -225,7 +240,8 @@ int hpsb_update_config_rom_image(struct
if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 * HZ))
/* Wait 60 seconds from the last time this generation number was
* used. */
- reset_delay = (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies;
+ reset_delay =
+ (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies;
else
/* Wait 1 second in case some other code wants to change the
* Config ROM in the near future. */
next prev parent reply other threads:[~2006-10-10 19:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-10 6:48 [PATCH] firewire: handle sysfs errors Jeff Garzik
2006-10-10 8:38 ` Stefan Richter
2006-10-10 12:52 ` Jeff Garzik
2006-10-10 19:11 ` [PATCH 2.6.19-rc1 1/3] ieee1394: lock smaller region by host_num_alloc mutex Stefan Richter
2006-10-10 19:12 ` Stefan Richter [this message]
2006-10-10 19:19 ` [PATCH 2.6.19-rc1 3/3] ieee1394: handle sysfs errors Stefan Richter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tkrat.1904a2df7d282ffa@s5r6.in-berlin.de \
--to=stefanr@s5r6.in-berlin.de \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox