summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorNathan Chancellor <natechancellor@gmail.com>2018-05-06 18:13:28 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-08 13:24:16 +0200
commitd2116990761d47ecc78da1475c67c6c7ba7c8ec3 (patch)
tree1f4d7f64dd78bd248678a5265181afb30843ad81 /drivers/staging/android
parent3ca4ce0efb260be526b0fab0578021db29ce50b0 (diff)
downloadlinux-stable-d2116990761d47ecc78da1475c67c6c7ba7c8ec3.tar.gz
linux-stable-d2116990761d47ecc78da1475c67c6c7ba7c8ec3.tar.bz2
linux-stable-d2116990761d47ecc78da1475c67c6c7ba7c8ec3.zip
staging: android: vsoc: Fix ending '(' warnings in vsoc_probe_device
Fixes checkpatch.pl warnings about lines ending with parentheses. Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/vsoc.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c
index c460740f9561..806beda1040b 100644
--- a/drivers/staging/android/vsoc.c
+++ b/drivers/staging/android/vsoc.c
@@ -841,8 +841,8 @@ static int vsoc_probe_device(struct pci_dev *pdev,
vsoc_dev.regions = (struct vsoc_device_region __force *)
((void *)vsoc_dev.layout +
vsoc_dev.layout->vsoc_region_desc_offset);
- vsoc_dev.msix_entries = kcalloc(
- vsoc_dev.layout->region_count,
+ vsoc_dev.msix_entries =
+ kcalloc(vsoc_dev.layout->region_count,
sizeof(vsoc_dev.msix_entries[0]), GFP_KERNEL);
if (!vsoc_dev.msix_entries) {
dev_err(&vsoc_dev.dev->dev,
@@ -850,8 +850,8 @@ static int vsoc_probe_device(struct pci_dev *pdev,
vsoc_remove_device(pdev);
return -ENOSPC;
}
- vsoc_dev.regions_data = kcalloc(
- vsoc_dev.layout->region_count,
+ vsoc_dev.regions_data =
+ kcalloc(vsoc_dev.layout->region_count,
sizeof(vsoc_dev.regions_data[0]), GFP_KERNEL);
if (!vsoc_dev.regions_data) {
dev_err(&vsoc_dev.dev->dev,
@@ -913,8 +913,8 @@ static int vsoc_probe_device(struct pci_dev *pdev,
name_sz);
dev_info(&pdev->dev, "region %d name=%s\n",
i, vsoc_dev.regions_data[i].name);
- init_waitqueue_head(
- &vsoc_dev.regions_data[i].interrupt_wait_queue);
+ init_waitqueue_head
+ (&vsoc_dev.regions_data[i].interrupt_wait_queue);
init_waitqueue_head(&vsoc_dev.regions_data[i].futex_wait_queue);
vsoc_dev.regions_data[i].incoming_signalled =
shm_off_to_virtual_addr(region->region_begin_offset) +
@@ -922,11 +922,10 @@ static int vsoc_probe_device(struct pci_dev *pdev,
vsoc_dev.regions_data[i].outgoing_signalled =
shm_off_to_virtual_addr(region->region_begin_offset) +
g_to_h_signal_table->interrupt_signalled_offset;
- result = request_irq(
- vsoc_dev.msix_entries[i].vector,
- vsoc_interrupt, 0,
- vsoc_dev.regions_data[i].name,
- vsoc_dev.regions_data + i);
+ result = request_irq(vsoc_dev.msix_entries[i].vector,
+ vsoc_interrupt, 0,
+ vsoc_dev.regions_data[i].name,
+ vsoc_dev.regions_data + i);
if (result) {
dev_info(&pdev->dev,
"request_irq failed irq=%d vector=%d\n",