aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-sbp2.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-01-26 11:42:45 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-02-16 09:40:32 -0500
commit05cca7381429e12d66c5b5c8b5c5848055b88bf7 (patch)
treeb2f0bf8edbb902dc14813441ea9f3600ed410c2d /drivers/firewire/fw-sbp2.c
parent19af35546de68c872dcb687613e0902a602cb20e (diff)
firewire: fw-sbp2: unsigned int vs. unsigned
Standardize on "unsigned int" style. Sort some struct members thematically. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-sbp2.c')
-rw-r--r--drivers/firewire/fw-sbp2.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 19ece9b6d742..f2a9a33b47a1 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -141,15 +141,13 @@ struct sbp2_logical_unit {
141struct sbp2_target { 141struct sbp2_target {
142 struct kref kref; 142 struct kref kref;
143 struct fw_unit *unit; 143 struct fw_unit *unit;
144 struct list_head lu_list;
144 145
145 u64 management_agent_address; 146 u64 management_agent_address;
146 int directory_id; 147 int directory_id;
147 int node_id; 148 int node_id;
148 int address_high; 149 int address_high;
149 150 unsigned int workarounds;
150 unsigned workarounds;
151 struct list_head lu_list;
152
153 unsigned int mgt_orb_timeout; 151 unsigned int mgt_orb_timeout;
154}; 152};
155 153
@@ -160,7 +158,7 @@ struct sbp2_target {
160 */ 158 */
161#define SBP2_MIN_LOGIN_ORB_TIMEOUT 5000U /* Timeout in ms */ 159#define SBP2_MIN_LOGIN_ORB_TIMEOUT 5000U /* Timeout in ms */
162#define SBP2_MAX_LOGIN_ORB_TIMEOUT 40000U /* Timeout in ms */ 160#define SBP2_MAX_LOGIN_ORB_TIMEOUT 40000U /* Timeout in ms */
163#define SBP2_ORB_TIMEOUT 2000 /* Timeout in ms */ 161#define SBP2_ORB_TIMEOUT 2000U /* Timeout in ms */
164#define SBP2_ORB_NULL 0x80000000 162#define SBP2_ORB_NULL 0x80000000
165#define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 163#define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000
166 164
@@ -297,7 +295,7 @@ struct sbp2_command_orb {
297static const struct { 295static const struct {
298 u32 firmware_revision; 296 u32 firmware_revision;
299 u32 model; 297 u32 model;
300 unsigned workarounds; 298 unsigned int workarounds;
301} sbp2_workarounds_table[] = { 299} sbp2_workarounds_table[] = {
302 /* DViCO Momobay CX-1 with TSB42AA9 bridge */ { 300 /* DViCO Momobay CX-1 with TSB42AA9 bridge */ {
303 .firmware_revision = 0x002800, 301 .firmware_revision = 0x002800,
@@ -836,7 +834,7 @@ static void sbp2_init_workarounds(struct sbp2_target *tgt, u32 model,
836 u32 firmware_revision) 834 u32 firmware_revision)
837{ 835{
838 int i; 836 int i;
839 unsigned w = sbp2_param_workarounds; 837 unsigned int w = sbp2_param_workarounds;
840 838
841 if (w) 839 if (w)
842 fw_notify("Please notify linux1394-devel@lists.sourceforge.net " 840 fw_notify("Please notify linux1394-devel@lists.sourceforge.net "
@@ -1197,7 +1195,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
1197 struct sbp2_logical_unit *lu = cmd->device->hostdata; 1195 struct sbp2_logical_unit *lu = cmd->device->hostdata;
1198 struct fw_device *device = fw_device(lu->tgt->unit->device.parent); 1196 struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
1199 struct sbp2_command_orb *orb; 1197 struct sbp2_command_orb *orb;
1200 unsigned max_payload; 1198 unsigned int max_payload;
1201 int retval = SCSI_MLQUEUE_HOST_BUSY; 1199 int retval = SCSI_MLQUEUE_HOST_BUSY;
1202 1200
1203 /* 1201 /*