| Message ID | 54ad6b3b-4185-9345-26d0-ab3fd9ce36e4@sandisk.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Jun 03, 2016 at 12:09:56PM -0700, Bart Van Assche wrote: > #define C_MAX_NAME 13 /* 12 chars + one for /0 */ >diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c >index 5cc492e..0d28a5a 100644 >--- a/drivers/infiniband/hw/hfi1/init.c >+++ b/drivers/infiniband/hw/hfi1/init.c >@@ -1337,7 +1337,7 @@ static void cleanup_device_data(struct hfi1_devdata *dd) > dma_free_coherent(&dd->pcidev->dev, sizeof(u64), > (void *)dd->rcvhdrtail_dummy_kvaddr, > dd->rcvhdrtail_dummy_physaddr); >- dd->rcvhdrtail_dummy_kvaddr = NULL; >+ dd->rcvhdrtail_dummy_kvaddr = NULL; > } > > for (ctxt = 0; tmp && ctxt < dd->num_rcv_contexts; ctxt++) { This is the same thing as a patch from Dan Carpenter I think? https://patchwork.kernel.org/patch/9139133/ -Denny -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/03/2016 12:26 PM, Dennis Dalessandro wrote: > On Fri, Jun 03, 2016 at 12:09:56PM -0700, Bart Van Assche wrote: >> #define C_MAX_NAME 13 /* 12 chars + one for /0 */ >> diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c >> index 5cc492e..0d28a5a 100644 >> --- a/drivers/infiniband/hw/hfi1/init.c >> +++ b/drivers/infiniband/hw/hfi1/init.c >> @@ -1337,7 +1337,7 @@ static void cleanup_device_data(struct hfi1_devdata *dd) >> dma_free_coherent(&dd->pcidev->dev, sizeof(u64), >> (void *)dd->rcvhdrtail_dummy_kvaddr, >> dd->rcvhdrtail_dummy_physaddr); >> - dd->rcvhdrtail_dummy_kvaddr = NULL; >> + dd->rcvhdrtail_dummy_kvaddr = NULL; >> } >> >> for (ctxt = 0; tmp && ctxt < dd->num_rcv_contexts; ctxt++) { > > This is the same thing as a patch from Dan Carpenter I think? > https://patchwork.kernel.org/patch/9139133/ Indeed, and apparently I forgot that I had already reviewed that patch :-) Bart. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c index 3b876da..81619fb 100644 --- a/drivers/infiniband/hw/hfi1/chip.c +++ b/drivers/infiniband/hw/hfi1/chip.c @@ -7832,8 +7832,8 @@ static void handle_dcc_err(struct hfi1_devdata *dd, u32 unused, u64 reg) * save first 2 flits in the packet that caused * the error */ - dd->err_info_rcvport.packet_flit1 = hdr0; - dd->err_info_rcvport.packet_flit2 = hdr1; + dd->err_info_rcvport.packet_flit1 = hdr0; + dd->err_info_rcvport.packet_flit2 = hdr1; } switch (info) { case 1: @@ -11906,7 +11906,7 @@ static void update_synth_timer(unsigned long opaque) hfi1_cdbg(CNTR, "[%d] No update necessary", dd->unit); } -mod_timer(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME); + mod_timer(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME); } #define C_MAX_NAME 13 /* 12 chars + one for /0 */ diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c index 5cc492e..0d28a5a 100644 --- a/drivers/infiniband/hw/hfi1/init.c +++ b/drivers/infiniband/hw/hfi1/init.c @@ -1337,7 +1337,7 @@ static void cleanup_device_data(struct hfi1_devdata *dd) dma_free_coherent(&dd->pcidev->dev, sizeof(u64), (void *)dd->rcvhdrtail_dummy_kvaddr, dd->rcvhdrtail_dummy_physaddr); - dd->rcvhdrtail_dummy_kvaddr = NULL; + dd->rcvhdrtail_dummy_kvaddr = NULL; } for (ctxt = 0; tmp && ctxt < dd->num_rcv_contexts; ctxt++) {
Make the indentation of the source code consistent. Detected by smatch. Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Mike Marciniszyn <mike.marciniszyn@intel.com> Cc: Dennis Dalessandro <dennis.dalessandro@intel.com> --- drivers/infiniband/hw/hfi1/chip.c | 6 +++--- drivers/infiniband/hw/hfi1/init.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)