aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.19/950-0317-char-vc_mem-Fix-all-coding-style-issues.patch
blob: 815900409d140185e2f71958afc6551ded9b8314 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
From 8d64f178c3568d212f3ddf05ea1ad7f103beeb86 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
Date: Wed, 23 Jan 2019 18:37:29 +0000
Subject: [PATCH 317/806] char: vc_mem: Fix all coding style issues.

Cleans up all checkpatch errors in vc_mem.c and vc_mem.h
No functional change to the code.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
---
 drivers/char/broadcom/vc_mem.c  | 177 +++++++++++---------------------
 include/linux/broadcom/vc_mem.h |  38 +++----
 2 files changed, 77 insertions(+), 138 deletions(-)

--- a/drivers/char/broadcom/vc_mem.c
+++ b/drivers/char/broadcom/vc_mem.c
@@ -1,16 +1,16 @@
-/*****************************************************************************
-* Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
-*
-* Unless you and Broadcom execute a separate written software license
-* agreement governing use of this software, this software is licensed to you
-* under the terms of the GNU General Public License version 2, available at
-* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-*
-* Notwithstanding the above, under no circumstances may you combine this
-* software in any way with any other Broadcom software provided under a
-* license other than the GPL, without Broadcom's express prior written
-* consent.
-*****************************************************************************/
+/*
+ * Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
+ *
+ * Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2, available at
+ * http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+ *
+ * Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a
+ * license other than the GPL, without Broadcom's express prior written
+ * consent.
+ */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -26,11 +26,11 @@
 
 #define DRIVER_NAME  "vc-mem"
 
-// Device (/dev) related variables
-static dev_t vc_mem_devnum = 0;
-static struct class *vc_mem_class = NULL;
+/* Device (/dev) related variables */
+static dev_t vc_mem_devnum;
+static struct class *vc_mem_class;
 static struct cdev vc_mem_cdev;
-static int vc_mem_inited = 0;
+static int vc_mem_inited;
 
 #ifdef CONFIG_DEBUG_FS
 static struct dentry *vc_mem_debugfs_entry;
@@ -50,96 +50,55 @@ static struct dentry *vc_mem_debugfs_ent
  * bootloader (and/or kernel). When that happens, the values of these variables
  * would be calculated and assigned in the init function.
  */
-// in the 2835 VC in mapped above ARM, but ARM has full access to VC space
-unsigned long mm_vc_mem_phys_addr = 0x00000000;
-unsigned int mm_vc_mem_size = 0;
-unsigned int mm_vc_mem_base = 0;
-
+/* In the 2835 VC in mapped above ARM, but ARM has full access to VC space */
+unsigned long mm_vc_mem_phys_addr;
 EXPORT_SYMBOL(mm_vc_mem_phys_addr);
+unsigned int mm_vc_mem_size;
 EXPORT_SYMBOL(mm_vc_mem_size);
+unsigned int mm_vc_mem_base;
 EXPORT_SYMBOL(mm_vc_mem_base);
 
-static uint phys_addr = 0;
-static uint mem_size = 0;
-static uint mem_base = 0;
-
-
-/****************************************************************************
-*
-*   vc_mem_open
-*
-***************************************************************************/
+static uint phys_addr;
+static uint mem_size;
+static uint mem_base;
 
 static int
 vc_mem_open(struct inode *inode, struct file *file)
 {
-	(void) inode;
-	(void) file;
+	(void)inode;
 
 	pr_debug("%s: called file = 0x%p\n", __func__, file);
 
 	return 0;
 }
 
-/****************************************************************************
-*
-*   vc_mem_release
-*
-***************************************************************************/
-
 static int
 vc_mem_release(struct inode *inode, struct file *file)
 {
-	(void) inode;
-	(void) file;
+	(void)inode;
 
 	pr_debug("%s: called file = 0x%p\n", __func__, file);
 
 	return 0;
 }
 
-/****************************************************************************
-*
-*   vc_mem_get_size
-*
-***************************************************************************/
-
 static void
 vc_mem_get_size(void)
 {
 }
 
-/****************************************************************************
-*
-*   vc_mem_get_base
-*
-***************************************************************************/
-
 static void
 vc_mem_get_base(void)
 {
 }
 
-/****************************************************************************
-*
-*   vc_mem_get_current_size
-*
-***************************************************************************/
-
 int
 vc_mem_get_current_size(void)
 {
 	return mm_vc_mem_size;
 }
-
 EXPORT_SYMBOL_GPL(vc_mem_get_current_size);
 
-/****************************************************************************
-*
-*   vc_mem_ioctl
-*
-***************************************************************************/
-
 static long
 vc_mem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
@@ -154,52 +113,52 @@ vc_mem_ioctl(struct file *file, unsigned
 	case VC_MEM_IOC_MEM_PHYS_ADDR:
 		{
 			pr_debug("%s: VC_MEM_IOC_MEM_PHYS_ADDR=0x%p\n",
-				__func__, (void *) mm_vc_mem_phys_addr);
+				__func__, (void *)mm_vc_mem_phys_addr);
 
-			if (copy_to_user((void *) arg, &mm_vc_mem_phys_addr,
-					 sizeof (mm_vc_mem_phys_addr)) != 0) {
+			if (copy_to_user((void *)arg, &mm_vc_mem_phys_addr,
+					 sizeof(mm_vc_mem_phys_addr))) {
 				rc = -EFAULT;
 			}
 			break;
 		}
 	case VC_MEM_IOC_MEM_SIZE:
 		{
-			// Get the videocore memory size first
+			/* Get the videocore memory size first */
 			vc_mem_get_size();
 
 			pr_debug("%s: VC_MEM_IOC_MEM_SIZE=%x\n", __func__,
-				mm_vc_mem_size);
+				 mm_vc_mem_size);
 
-			if (copy_to_user((void *) arg, &mm_vc_mem_size,
-					 sizeof (mm_vc_mem_size)) != 0) {
+			if (copy_to_user((void *)arg, &mm_vc_mem_size,
+					 sizeof(mm_vc_mem_size))) {
 				rc = -EFAULT;
 			}
 			break;
 		}
 	case VC_MEM_IOC_MEM_BASE:
 		{
-			// Get the videocore memory base
+			/* Get the videocore memory base */
 			vc_mem_get_base();
 
 			pr_debug("%s: VC_MEM_IOC_MEM_BASE=%x\n", __func__,
-				mm_vc_mem_base);
+				 mm_vc_mem_base);
 
-			if (copy_to_user((void *) arg, &mm_vc_mem_base,
-					 sizeof (mm_vc_mem_base)) != 0) {
+			if (copy_to_user((void *)arg, &mm_vc_mem_base,
+					 sizeof(mm_vc_mem_base))) {
 				rc = -EFAULT;
 			}
 			break;
 		}
 	case VC_MEM_IOC_MEM_LOAD:
 		{
-			// Get the videocore memory base
+			/* Get the videocore memory base */
 			vc_mem_get_base();
 
 			pr_debug("%s: VC_MEM_IOC_MEM_LOAD=%x\n", __func__,
 				mm_vc_mem_base);
 
-			if (copy_to_user((void *) arg, &mm_vc_mem_base,
-					 sizeof (mm_vc_mem_base)) != 0) {
+			if (copy_to_user((void *)arg, &mm_vc_mem_base,
+					 sizeof(mm_vc_mem_base))) {
 				rc = -EFAULT;
 			}
 			break;
@@ -243,12 +202,6 @@ vc_mem_compat_ioctl(struct file *file, u
 }
 #endif
 
-/****************************************************************************
-*
-*   vc_mem_mmap
-*
-***************************************************************************/
-
 static int
 vc_mem_mmap(struct file *filp, struct vm_area_struct *vma)
 {
@@ -257,32 +210,26 @@ vc_mem_mmap(struct file *filp, struct vm
 	unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
 
 	pr_debug("%s: vm_start = 0x%08lx vm_end = 0x%08lx vm_pgoff = 0x%08lx\n",
-		__func__, (long) vma->vm_start, (long) vma->vm_end,
-		(long) vma->vm_pgoff);
+		 __func__, (long)vma->vm_start, (long)vma->vm_end,
+		 (long)vma->vm_pgoff);
 
 	if (offset + length > mm_vc_mem_size) {
 		pr_err("%s: length %ld is too big\n", __func__, length);
 		return -EINVAL;
 	}
-	// Do not cache the memory map
+	/* Do not cache the memory map */
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
 	rc = remap_pfn_range(vma, vma->vm_start,
 			     (mm_vc_mem_phys_addr >> PAGE_SHIFT) +
 			     vma->vm_pgoff, length, vma->vm_page_prot);
-	if (rc != 0) {
+	if (rc)
 		pr_err("%s: remap_pfn_range failed (rc=%d)\n", __func__, rc);
-	}
 
 	return rc;
 }
 
-/****************************************************************************
-*
-*   File Operations for the driver.
-*
-***************************************************************************/
-
+/* File Operations for the driver. */
 static const struct file_operations vc_mem_fops = {
 	.owner = THIS_MODULE,
 	.open = vc_mem_open,
@@ -316,7 +263,7 @@ static int vc_mem_debugfs_init(
 				vc_mem_debugfs_entry,
 				(u32 *)&mm_vc_mem_phys_addr)) {
 		dev_warn(dev, "%s:could not create vc_mem_phys entry\n",
-			__func__);
+			 __func__);
 		goto fail;
 	}
 
@@ -325,7 +272,7 @@ static int vc_mem_debugfs_init(
 				vc_mem_debugfs_entry,
 				(u32 *)&mm_vc_mem_size)) {
 		dev_warn(dev, "%s:could not create vc_mem_size entry\n",
-			__func__);
+			 __func__);
 		goto fail;
 	}
 
@@ -347,12 +294,7 @@ fail:
 
 #endif /* CONFIG_DEBUG_FS */
 
-
-/****************************************************************************
-*
-*   vc_mem_init
-*
-***************************************************************************/
+/* Module load/unload functions */
 
 static int __init
 vc_mem_init(void)
@@ -369,16 +311,19 @@ vc_mem_init(void)
 	vc_mem_get_size();
 
 	pr_info("vc-mem: phys_addr:0x%08lx mem_base=0x%08x mem_size:0x%08x(%u MiB)\n",
-		mm_vc_mem_phys_addr, mm_vc_mem_base, mm_vc_mem_size, mm_vc_mem_size / (1024 * 1024));
+		mm_vc_mem_phys_addr, mm_vc_mem_base, mm_vc_mem_size,
+		mm_vc_mem_size / (1024 * 1024));
 
-	if ((rc = alloc_chrdev_region(&vc_mem_devnum, 0, 1, DRIVER_NAME)) < 0) {
+	rc = alloc_chrdev_region(&vc_mem_devnum, 0, 1, DRIVER_NAME);
+	if (rc < 0) {
 		pr_err("%s: alloc_chrdev_region failed (rc=%d)\n",
 		       __func__, rc);
 		goto out_err;
 	}
 
 	cdev_init(&vc_mem_cdev, &vc_mem_fops);
-	if ((rc = cdev_add(&vc_mem_cdev, vc_mem_devnum, 1)) != 0) {
+	rc = cdev_add(&vc_mem_cdev, vc_mem_devnum, 1);
+	if (rc) {
 		pr_err("%s: cdev_add failed (rc=%d)\n", __func__, rc);
 		goto out_unregister;
 	}
@@ -408,26 +353,20 @@ vc_mem_init(void)
 
 	device_destroy(vc_mem_class, vc_mem_devnum);
 
-      out_class_destroy:
+out_class_destroy:
 	class_destroy(vc_mem_class);
 	vc_mem_class = NULL;
 
-      out_cdev_del:
+out_cdev_del:
 	cdev_del(&vc_mem_cdev);
 
-      out_unregister:
+out_unregister:
 	unregister_chrdev_region(vc_mem_devnum, 1);
 
-      out_err:
+out_err:
 	return -1;
 }
 
-/****************************************************************************
-*
-*   vc_mem_exit
-*
-***************************************************************************/
-
 static void __exit
 vc_mem_exit(void)
 {
--- a/include/linux/broadcom/vc_mem.h
+++ b/include/linux/broadcom/vc_mem.h
@@ -1,16 +1,16 @@
-/*****************************************************************************
-* Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
-*
-* Unless you and Broadcom execute a separate written software license
-* agreement governing use of this software, this software is licensed to you
-* under the terms of the GNU General Public License version 2, available at
-* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-*
-* Notwithstanding the above, under no circumstances may you combine this
-* software in any way with any other Broadcom software provided under a
-* license other than the GPL, without Broadcom's express prior written
-* consent.
-*****************************************************************************/
+/*
+ * Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
+ *
+ * Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2, available at
+ * http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+ *
+ * Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a
+ * license other than the GPL, without Broadcom's express prior written
+ * consent.
+ */
 
 #ifndef _VC_MEM_H
 #define _VC_MEM_H
@@ -19,17 +19,17 @@
 
 #define VC_MEM_IOC_MAGIC  'v'
 
-#define VC_MEM_IOC_MEM_PHYS_ADDR    _IOR( VC_MEM_IOC_MAGIC, 0, unsigned long )
-#define VC_MEM_IOC_MEM_SIZE         _IOR( VC_MEM_IOC_MAGIC, 1, unsigned int )
-#define VC_MEM_IOC_MEM_BASE         _IOR( VC_MEM_IOC_MAGIC, 2, unsigned int )
-#define VC_MEM_IOC_MEM_LOAD         _IOR( VC_MEM_IOC_MAGIC, 3, unsigned int )
+#define VC_MEM_IOC_MEM_PHYS_ADDR    _IOR(VC_MEM_IOC_MAGIC, 0, unsigned long)
+#define VC_MEM_IOC_MEM_SIZE         _IOR(VC_MEM_IOC_MAGIC, 1, unsigned int)
+#define VC_MEM_IOC_MEM_BASE         _IOR(VC_MEM_IOC_MAGIC, 2, unsigned int)
+#define VC_MEM_IOC_MEM_LOAD         _IOR(VC_MEM_IOC_MAGIC, 3, unsigned int)
 
-#if defined( __KERNEL__ )
+#ifdef __KERNEL__
 #define VC_MEM_TO_ARM_ADDR_MASK 0x3FFFFFFF
 
 extern unsigned long mm_vc_mem_phys_addr;
 extern unsigned int  mm_vc_mem_size;
-extern int vc_mem_get_current_size( void );
+extern int vc_mem_get_current_size(void);
 #endif
 
 #ifdef CONFIG_COMPAT