diff options
author | Roland Dreier <rolandd@cisco.com> | 2008-04-17 00:01:03 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-04-17 00:01:03 -0400 |
commit | b39993936d3b192ea088995f7ba882a49e4bf09c (patch) | |
tree | 367480615b9c047a22b297cb310390b1fc8733f1 /drivers/infiniband | |
parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) |
IB/mthca: Formatting cleanups
Fix a few whitespace and other coding style problems.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_cmd.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_dev.h | 10 | ||||
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_eq.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_mad.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_memfree.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_provider.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c index 09a30dd12b14..667c35ddb7ce 100644 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c | |||
@@ -219,7 +219,7 @@ static void mthca_cmd_post_dbell(struct mthca_dev *dev, | |||
219 | __raw_writel((__force u32) cpu_to_be32((1 << HCR_GO_BIT) | | 219 | __raw_writel((__force u32) cpu_to_be32((1 << HCR_GO_BIT) | |
220 | (1 << HCA_E_BIT) | | 220 | (1 << HCA_E_BIT) | |
221 | (op_modifier << HCR_OPMOD_SHIFT) | | 221 | (op_modifier << HCR_OPMOD_SHIFT) | |
222 | op), ptr + offs[6]); | 222 | op), ptr + offs[6]); |
223 | wmb(); | 223 | wmb(); |
224 | __raw_writel((__force u32) 0, ptr + offs[7]); | 224 | __raw_writel((__force u32) 0, ptr + offs[7]); |
225 | wmb(); | 225 | wmb(); |
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h index 7bbdd1f4e6c7..f82ed832ad97 100644 --- a/drivers/infiniband/hw/mthca/mthca_dev.h +++ b/drivers/infiniband/hw/mthca/mthca_dev.h | |||
@@ -390,11 +390,11 @@ extern void __buggy_use_of_MTHCA_PUT(void); | |||
390 | do { \ | 390 | do { \ |
391 | void *__p = (char *) (source) + (offset); \ | 391 | void *__p = (char *) (source) + (offset); \ |
392 | switch (sizeof (dest)) { \ | 392 | switch (sizeof (dest)) { \ |
393 | case 1: (dest) = *(u8 *) __p; break; \ | 393 | case 1: (dest) = *(u8 *) __p; break; \ |
394 | case 2: (dest) = be16_to_cpup(__p); break; \ | 394 | case 2: (dest) = be16_to_cpup(__p); break; \ |
395 | case 4: (dest) = be32_to_cpup(__p); break; \ | 395 | case 4: (dest) = be32_to_cpup(__p); break; \ |
396 | case 8: (dest) = be64_to_cpup(__p); break; \ | 396 | case 8: (dest) = be64_to_cpup(__p); break; \ |
397 | default: __buggy_use_of_MTHCA_GET(); \ | 397 | default: __buggy_use_of_MTHCA_GET(); \ |
398 | } \ | 398 | } \ |
399 | } while (0) | 399 | } while (0) |
400 | 400 | ||
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c index b60eb5df96e8..8bde7f98e58a 100644 --- a/drivers/infiniband/hw/mthca/mthca_eq.c +++ b/drivers/infiniband/hw/mthca/mthca_eq.c | |||
@@ -232,9 +232,9 @@ static inline struct mthca_eqe *get_eqe(struct mthca_eq *eq, u32 entry) | |||
232 | return eq->page_list[off / PAGE_SIZE].buf + off % PAGE_SIZE; | 232 | return eq->page_list[off / PAGE_SIZE].buf + off % PAGE_SIZE; |
233 | } | 233 | } |
234 | 234 | ||
235 | static inline struct mthca_eqe* next_eqe_sw(struct mthca_eq *eq) | 235 | static inline struct mthca_eqe *next_eqe_sw(struct mthca_eq *eq) |
236 | { | 236 | { |
237 | struct mthca_eqe* eqe; | 237 | struct mthca_eqe *eqe; |
238 | eqe = get_eqe(eq, eq->cons_index); | 238 | eqe = get_eqe(eq, eq->cons_index); |
239 | return (MTHCA_EQ_ENTRY_OWNER_HW & eqe->owner) ? NULL : eqe; | 239 | return (MTHCA_EQ_ENTRY_OWNER_HW & eqe->owner) ? NULL : eqe; |
240 | } | 240 | } |
diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c index acfa41d968ee..8b7e83e6e88f 100644 --- a/drivers/infiniband/hw/mthca/mthca_mad.c +++ b/drivers/infiniband/hw/mthca/mthca_mad.c | |||
@@ -125,7 +125,7 @@ static void smp_snoop(struct ib_device *ibdev, | |||
125 | event.device = ibdev; | 125 | event.device = ibdev; |
126 | event.element.port_num = port_num; | 126 | event.element.port_num = port_num; |
127 | 127 | ||
128 | if(pinfo->clientrereg_resv_subnetto & 0x80) | 128 | if (pinfo->clientrereg_resv_subnetto & 0x80) |
129 | event.event = IB_EVENT_CLIENT_REREGISTER; | 129 | event.event = IB_EVENT_CLIENT_REREGISTER; |
130 | else | 130 | else |
131 | event.event = IB_EVENT_LID_CHANGE; | 131 | event.event = IB_EVENT_LID_CHANGE; |
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c index 252db0822f6c..d7d502dd741e 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/drivers/infiniband/hw/mthca/mthca_memfree.c | |||
@@ -412,7 +412,7 @@ err: | |||
412 | if (table->icm[i]) { | 412 | if (table->icm[i]) { |
413 | mthca_UNMAP_ICM(dev, virt + i * MTHCA_TABLE_CHUNK_SIZE, | 413 | mthca_UNMAP_ICM(dev, virt + i * MTHCA_TABLE_CHUNK_SIZE, |
414 | MTHCA_TABLE_CHUNK_SIZE / MTHCA_ICM_PAGE_SIZE, | 414 | MTHCA_TABLE_CHUNK_SIZE / MTHCA_ICM_PAGE_SIZE, |
415 | &status); | 415 | &status); |
416 | mthca_free_icm(dev, table->icm[i], table->coherent); | 416 | mthca_free_icm(dev, table->icm[i], table->coherent); |
417 | } | 417 | } |
418 | 418 | ||
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c index 9e491df6419c..ee9bc1456226 100644 --- a/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/drivers/infiniband/hw/mthca/mthca_provider.c | |||
@@ -60,7 +60,7 @@ static int mthca_query_device(struct ib_device *ibdev, | |||
60 | struct ib_smp *in_mad = NULL; | 60 | struct ib_smp *in_mad = NULL; |
61 | struct ib_smp *out_mad = NULL; | 61 | struct ib_smp *out_mad = NULL; |
62 | int err = -ENOMEM; | 62 | int err = -ENOMEM; |
63 | struct mthca_dev* mdev = to_mdev(ibdev); | 63 | struct mthca_dev *mdev = to_mdev(ibdev); |
64 | 64 | ||
65 | u8 status; | 65 | u8 status; |
66 | 66 | ||