diff options
author | Ashutosh Dixit <ashutosh.dixit@intel.com> | 2013-09-27 12:49:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-27 20:20:19 -0400 |
commit | ced2c60fb5024a5cf5c33cb573b3d6a66d738f36 (patch) | |
tree | 19763d6180d0a9b16f0da478c4801f3445424b28 /drivers/misc/mic/host/mic_smpt.c | |
parent | 4aa79961a50119d6112a160e97d5e6a77656b68c (diff) |
misc: mic: cleanups for "--strict" checkpatch.
These changes were mostly authored by Joe Perches <joe@perches.com>
@ https://lkml.org/lkml/2013/9/5/602
Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
Signed-off-by: Harshavardhan R Kharche <harshavardhan.r.kharche@intel.com>
Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mic/host/mic_smpt.c')
-rw-r--r-- | drivers/misc/mic/host/mic_smpt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/misc/mic/host/mic_smpt.c b/drivers/misc/mic/host/mic_smpt.c index 003d02b212be..fae474c4899e 100644 --- a/drivers/misc/mic/host/mic_smpt.c +++ b/drivers/misc/mic/host/mic_smpt.c | |||
@@ -84,7 +84,7 @@ static void mic_add_smpt_entry(int spt, s64 *ref, u64 addr, | |||
84 | for (i = spt; i < spt + entries; i++, | 84 | for (i = spt; i < spt + entries; i++, |
85 | addr += smpt_info->info.page_size) { | 85 | addr += smpt_info->info.page_size) { |
86 | if (!smpt_info->entry[i].ref_count && | 86 | if (!smpt_info->entry[i].ref_count && |
87 | (smpt_info->entry[i].dma_addr != addr)) { | 87 | (smpt_info->entry[i].dma_addr != addr)) { |
88 | mdev->smpt_ops->set(mdev, addr, i); | 88 | mdev->smpt_ops->set(mdev, addr, i); |
89 | smpt_info->entry[i].dma_addr = addr; | 89 | smpt_info->entry[i].dma_addr = addr; |
90 | } | 90 | } |
@@ -183,7 +183,7 @@ mic_to_dma_addr(struct mic_device *mdev, dma_addr_t mic_addr) | |||
183 | 183 | ||
184 | if (!mic_is_system_addr(mdev, mic_addr)) { | 184 | if (!mic_is_system_addr(mdev, mic_addr)) { |
185 | dev_err(mdev->sdev->parent, | 185 | dev_err(mdev->sdev->parent, |
186 | "mic_addr is invalid. mic_addr = 0x%llx\n", mic_addr); | 186 | "mic_addr is invalid. mic_addr = 0x%llx\n", mic_addr); |
187 | return -EINVAL; | 187 | return -EINVAL; |
188 | } | 188 | } |
189 | spt = mic_sys_addr_to_smpt(mdev, mic_addr); | 189 | spt = mic_sys_addr_to_smpt(mdev, mic_addr); |
@@ -286,7 +286,7 @@ void mic_unmap(struct mic_device *mdev, dma_addr_t mic_addr, size_t size) | |||
286 | smpt_info->entry[i].ref_count -= ref[i - spt]; | 286 | smpt_info->entry[i].ref_count -= ref[i - spt]; |
287 | if (smpt_info->entry[i].ref_count < 0) | 287 | if (smpt_info->entry[i].ref_count < 0) |
288 | dev_warn(mdev->sdev->parent, | 288 | dev_warn(mdev->sdev->parent, |
289 | "ref count for entry %d is negative\n", i); | 289 | "ref count for entry %d is negative\n", i); |
290 | } | 290 | } |
291 | spin_unlock_irqrestore(&smpt_info->smpt_lock, flags); | 291 | spin_unlock_irqrestore(&smpt_info->smpt_lock, flags); |
292 | kfree(ref); | 292 | kfree(ref); |
@@ -320,7 +320,7 @@ dma_addr_t mic_map_single(struct mic_device *mdev, void *va, size_t size) | |||
320 | "mic_map failed dma_addr 0x%llx size 0x%lx\n", | 320 | "mic_map failed dma_addr 0x%llx size 0x%lx\n", |
321 | dma_addr, size); | 321 | dma_addr, size); |
322 | pci_unmap_single(pdev, dma_addr, | 322 | pci_unmap_single(pdev, dma_addr, |
323 | size, PCI_DMA_BIDIRECTIONAL); | 323 | size, PCI_DMA_BIDIRECTIONAL); |
324 | } | 324 | } |
325 | } | 325 | } |
326 | return mic_addr; | 326 | return mic_addr; |
@@ -366,8 +366,8 @@ int mic_smpt_init(struct mic_device *mdev) | |||
366 | 366 | ||
367 | smpt_info = mdev->smpt; | 367 | smpt_info = mdev->smpt; |
368 | mdev->smpt_ops->init(mdev); | 368 | mdev->smpt_ops->init(mdev); |
369 | smpt_info->entry = kmalloc(sizeof(struct mic_smpt) | 369 | smpt_info->entry = kmalloc_array(smpt_info->info.num_reg, |
370 | * smpt_info->info.num_reg, GFP_KERNEL); | 370 | sizeof(*smpt_info->entry), GFP_KERNEL); |
371 | if (!smpt_info->entry) { | 371 | if (!smpt_info->entry) { |
372 | err = -ENOMEM; | 372 | err = -ENOMEM; |
373 | goto free_smpt; | 373 | goto free_smpt; |
@@ -412,7 +412,7 @@ void mic_smpt_uninit(struct mic_device *mdev) | |||
412 | smpt_info->entry[i].ref_count); | 412 | smpt_info->entry[i].ref_count); |
413 | if (smpt_info->entry[i].ref_count) | 413 | if (smpt_info->entry[i].ref_count) |
414 | dev_warn(mdev->sdev->parent, | 414 | dev_warn(mdev->sdev->parent, |
415 | "ref count for entry %d is not zero\n", i); | 415 | "ref count for entry %d is not zero\n", i); |
416 | } | 416 | } |
417 | kfree(smpt_info->entry); | 417 | kfree(smpt_info->entry); |
418 | kfree(smpt_info); | 418 | kfree(smpt_info); |