Skip to content

Commit 6a889dc

Browse files
AlexonOliveiragregkh
AlexonOliveira
authored and
gregkh
committed
staging: vme_user: fix alignment of open parenthesis
Fixed all CHECK: Alignment should match open parenthesis as reported by checkpatch to adhere to the Linux kernel coding-style guidelines. Signed-off-by: Alexon Oliveira <alexondunkan@gmail.com> Link: https://lore.kernel.org/r/ZNO6HohffQlbh7jn@alolivei-thinkpadt480s.gru.csb Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c3bdcb9 commit 6a889dc

1 file changed

Lines changed: 42 additions & 41 deletions

File tree

  • drivers/staging/vme_user

‎drivers/staging/vme_user/vme.c‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static struct vme_bridge *find_bridge(struct vme_resource *resource)
7979
* Return: Virtual address of allocation on success, NULL on failure.
8080
*/
8181
void *vme_alloc_consistent(struct vme_resource *resource, size_t size,
82-
dma_addr_t *dma)
82+
dma_addr_t *dma)
8383
{
8484
struct vme_bridge *bridge;
8585

@@ -119,7 +119,7 @@ EXPORT_SYMBOL(vme_alloc_consistent);
119119
* Free previously allocated block of contiguous memory.
120120
*/
121121
void vme_free_consistent(struct vme_resource *resource, size_t size,
122-
void *vaddr, dma_addr_t dma)
122+
void *vaddr, dma_addr_t dma)
123123
{
124124
struct vme_bridge *bridge;
125125

@@ -169,14 +169,14 @@ size_t vme_get_size(struct vme_resource *resource)
169169
switch (resource->type) {
170170
case VME_MASTER:
171171
retval = vme_master_get(resource, &enabled, &base, &size,
172-
&aspace, &cycle, &dwidth);
172+
&aspace, &cycle, &dwidth);
173173
if (retval)
174174
return 0;
175175

176176
return size;
177177
case VME_SLAVE:
178178
retval = vme_slave_get(resource, &enabled, &base, &size,
179-
&buf_base, &aspace, &cycle);
179+
&buf_base, &aspace, &cycle);
180180
if (retval)
181181
return 0;
182182

@@ -279,7 +279,7 @@ static u32 vme_get_aspace(int am)
279279
* Return: Pointer to VME resource on success, NULL on failure.
280280
*/
281281
struct vme_resource *vme_slave_request(struct vme_dev *vdev, u32 address,
282-
u32 cycle)
282+
u32 cycle)
283283
{
284284
struct vme_bridge *bridge;
285285
struct list_head *slave_pos = NULL;
@@ -296,7 +296,7 @@ struct vme_resource *vme_slave_request(struct vme_dev *vdev, u32 address,
296296
/* Loop through slave resources */
297297
list_for_each(slave_pos, &bridge->slave_resources) {
298298
slave_image = list_entry(slave_pos,
299-
struct vme_slave_resource, list);
299+
struct vme_slave_resource, list);
300300

301301
if (!slave_image) {
302302
printk(KERN_ERR "Registered NULL Slave resource\n");
@@ -306,8 +306,8 @@ struct vme_resource *vme_slave_request(struct vme_dev *vdev, u32 address,
306306
/* Find an unlocked and compatible image */
307307
mutex_lock(&slave_image->mtx);
308308
if (((slave_image->address_attr & address) == address) &&
309-
((slave_image->cycle_attr & cycle) == cycle) &&
310-
(slave_image->locked == 0)) {
309+
((slave_image->cycle_attr & cycle) == cycle) &&
310+
(slave_image->locked == 0)) {
311311

312312
slave_image->locked = 1;
313313
mutex_unlock(&slave_image->mtx);
@@ -359,8 +359,8 @@ EXPORT_SYMBOL(vme_slave_request);
359359
* returned.
360360
*/
361361
int vme_slave_set(struct vme_resource *resource, int enabled,
362-
unsigned long long vme_base, unsigned long long size,
363-
dma_addr_t buf_base, u32 aspace, u32 cycle)
362+
unsigned long long vme_base, unsigned long long size,
363+
dma_addr_t buf_base, u32 aspace, u32 cycle)
364364
{
365365
struct vme_bridge *bridge = find_bridge(resource);
366366
struct vme_slave_resource *image;
@@ -379,7 +379,7 @@ int vme_slave_set(struct vme_resource *resource, int enabled,
379379
}
380380

381381
if (!(((image->address_attr & aspace) == aspace) &&
382-
((image->cycle_attr & cycle) == cycle))) {
382+
((image->cycle_attr & cycle) == cycle))) {
383383
printk(KERN_ERR "Invalid attributes\n");
384384
return -EINVAL;
385385
}
@@ -409,8 +409,8 @@ EXPORT_SYMBOL(vme_slave_set);
409409
* device or if an invalid resource has been provided.
410410
*/
411411
int vme_slave_get(struct vme_resource *resource, int *enabled,
412-
unsigned long long *vme_base, unsigned long long *size,
413-
dma_addr_t *buf_base, u32 *aspace, u32 *cycle)
412+
unsigned long long *vme_base, unsigned long long *size,
413+
dma_addr_t *buf_base, u32 *aspace, u32 *cycle)
414414
{
415415
struct vme_bridge *bridge = find_bridge(resource);
416416
struct vme_slave_resource *image;
@@ -448,7 +448,7 @@ void vme_slave_free(struct vme_resource *resource)
448448
}
449449

450450
slave_image = list_entry(resource->entry, struct vme_slave_resource,
451-
list);
451+
list);
452452
if (!slave_image) {
453453
printk(KERN_ERR "Can't find slave resource\n");
454454
return;
@@ -480,7 +480,7 @@ EXPORT_SYMBOL(vme_slave_free);
480480
* Return: Pointer to VME resource on success, NULL on failure.
481481
*/
482482
struct vme_resource *vme_master_request(struct vme_dev *vdev, u32 address,
483-
u32 cycle, u32 dwidth)
483+
u32 cycle, u32 dwidth)
484484
{
485485
struct vme_bridge *bridge;
486486
struct list_head *master_pos = NULL;
@@ -497,7 +497,7 @@ struct vme_resource *vme_master_request(struct vme_dev *vdev, u32 address,
497497
/* Loop through master resources */
498498
list_for_each(master_pos, &bridge->master_resources) {
499499
master_image = list_entry(master_pos,
500-
struct vme_master_resource, list);
500+
struct vme_master_resource, list);
501501

502502
if (!master_image) {
503503
printk(KERN_WARNING "Registered NULL master resource\n");
@@ -507,9 +507,9 @@ struct vme_resource *vme_master_request(struct vme_dev *vdev, u32 address,
507507
/* Find an unlocked and compatible image */
508508
spin_lock(&master_image->lock);
509509
if (((master_image->address_attr & address) == address) &&
510-
((master_image->cycle_attr & cycle) == cycle) &&
511-
((master_image->width_attr & dwidth) == dwidth) &&
512-
(master_image->locked == 0)) {
510+
((master_image->cycle_attr & cycle) == cycle) &&
511+
((master_image->width_attr & dwidth) == dwidth) &&
512+
(master_image->locked == 0)) {
513513

514514
master_image->locked = 1;
515515
spin_unlock(&master_image->lock);
@@ -563,8 +563,8 @@ EXPORT_SYMBOL(vme_master_request);
563563
* returned.
564564
*/
565565
int vme_master_set(struct vme_resource *resource, int enabled,
566-
unsigned long long vme_base, unsigned long long size, u32 aspace,
567-
u32 cycle, u32 dwidth)
566+
unsigned long long vme_base, unsigned long long size,
567+
u32 aspace, u32 cycle, u32 dwidth)
568568
{
569569
struct vme_bridge *bridge = find_bridge(resource);
570570
struct vme_master_resource *image;
@@ -583,8 +583,8 @@ int vme_master_set(struct vme_resource *resource, int enabled,
583583
}
584584

585585
if (!(((image->address_attr & aspace) == aspace) &&
586-
((image->cycle_attr & cycle) == cycle) &&
587-
((image->width_attr & dwidth) == dwidth))) {
586+
((image->cycle_attr & cycle) == cycle) &&
587+
((image->width_attr & dwidth) == dwidth))) {
588588
printk(KERN_WARNING "Invalid attributes\n");
589589
return -EINVAL;
590590
}
@@ -614,8 +614,8 @@ EXPORT_SYMBOL(vme_master_set);
614614
* device or if an invalid resource has been provided.
615615
*/
616616
int vme_master_get(struct vme_resource *resource, int *enabled,
617-
unsigned long long *vme_base, unsigned long long *size, u32 *aspace,
618-
u32 *cycle, u32 *dwidth)
617+
unsigned long long *vme_base, unsigned long long *size,
618+
u32 *aspace, u32 *cycle, u32 *dwidth)
619619
{
620620
struct vme_bridge *bridge = find_bridge(resource);
621621
struct vme_master_resource *image;
@@ -653,7 +653,7 @@ EXPORT_SYMBOL(vme_master_get);
653653
* returned.
654654
*/
655655
ssize_t vme_master_read(struct vme_resource *resource, void *buf, size_t count,
656-
loff_t offset)
656+
loff_t offset)
657657
{
658658
struct vme_bridge *bridge = find_bridge(resource);
659659
struct vme_master_resource *image;
@@ -702,7 +702,7 @@ EXPORT_SYMBOL(vme_master_read);
702702
* returned.
703703
*/
704704
ssize_t vme_master_write(struct vme_resource *resource, void *buf,
705-
size_t count, loff_t offset)
705+
size_t count, loff_t offset)
706706
{
707707
struct vme_bridge *bridge = find_bridge(resource);
708708
struct vme_master_resource *image;
@@ -754,7 +754,7 @@ EXPORT_SYMBOL(vme_master_write);
754754
* errors may also be returned.
755755
*/
756756
unsigned int vme_master_rmw(struct vme_resource *resource, unsigned int mask,
757-
unsigned int compare, unsigned int swap, loff_t offset)
757+
unsigned int compare, unsigned int swap, loff_t offset)
758758
{
759759
struct vme_bridge *bridge = find_bridge(resource);
760760
struct vme_master_resource *image;
@@ -828,7 +828,7 @@ void vme_master_free(struct vme_resource *resource)
828828
}
829829

830830
master_image = list_entry(resource->entry, struct vme_master_resource,
831-
list);
831+
list);
832832
if (!master_image) {
833833
printk(KERN_ERR "Can't find master resource\n");
834834
return;
@@ -877,7 +877,7 @@ struct vme_resource *vme_dma_request(struct vme_dev *vdev, u32 route)
877877
/* Loop through DMA resources */
878878
list_for_each(dma_pos, &bridge->dma_resources) {
879879
dma_ctrlr = list_entry(dma_pos,
880-
struct vme_dma_resource, list);
880+
struct vme_dma_resource, list);
881881
if (!dma_ctrlr) {
882882
printk(KERN_ERR "Registered NULL DMA resource\n");
883883
continue;
@@ -886,7 +886,7 @@ struct vme_resource *vme_dma_request(struct vme_dev *vdev, u32 route)
886886
/* Find an unlocked and compatible controller */
887887
mutex_lock(&dma_ctrlr->mtx);
888888
if (((dma_ctrlr->route_attr & route) == route) &&
889-
(dma_ctrlr->locked == 0)) {
889+
(dma_ctrlr->locked == 0)) {
890890

891891
dma_ctrlr->locked = 1;
892892
mutex_unlock(&dma_ctrlr->mtx);
@@ -1045,7 +1045,7 @@ EXPORT_SYMBOL(vme_dma_pci_attribute);
10451045
* Return: Pointer to VME DMA attribute, NULL on failure.
10461046
*/
10471047
struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long address,
1048-
u32 aspace, u32 cycle, u32 dwidth)
1048+
u32 aspace, u32 cycle, u32 dwidth)
10491049
{
10501050
struct vme_dma_attr *attributes;
10511051
struct vme_dma_vme *vme_attr;
@@ -1107,7 +1107,7 @@ EXPORT_SYMBOL(vme_dma_free_attribute);
11071107
* Hardware specific errors also possible.
11081108
*/
11091109
int vme_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
1110-
struct vme_dma_attr *dest, size_t count)
1110+
struct vme_dma_attr *dest, size_t count)
11111111
{
11121112
struct vme_bridge *bridge = list->parent->parent;
11131113
int retval;
@@ -1331,8 +1331,8 @@ EXPORT_SYMBOL(vme_irq_handler);
13311331
* already in use. Hardware specific errors also possible.
13321332
*/
13331333
int vme_irq_request(struct vme_dev *vdev, int level, int statid,
1334-
void (*callback)(int, int, void *),
1335-
void *priv_data)
1334+
void (*callback)(int, int, void *),
1335+
void *priv_data)
13361336
{
13371337
struct vme_bridge *bridge;
13381338

@@ -1479,7 +1479,7 @@ struct vme_resource *vme_lm_request(struct vme_dev *vdev)
14791479
/* Loop through LM resources */
14801480
list_for_each(lm_pos, &bridge->lm_resources) {
14811481
lm = list_entry(lm_pos,
1482-
struct vme_lm_resource, list);
1482+
struct vme_lm_resource, list);
14831483
if (!lm) {
14841484
printk(KERN_ERR "Registered NULL Location Monitor resource\n");
14851485
continue;
@@ -1561,7 +1561,7 @@ EXPORT_SYMBOL(vme_lm_count);
15611561
* errors may also be returned.
15621562
*/
15631563
int vme_lm_set(struct vme_resource *resource, unsigned long long lm_base,
1564-
u32 aspace, u32 cycle)
1564+
u32 aspace, u32 cycle)
15651565
{
15661566
struct vme_bridge *bridge = find_bridge(resource);
15671567
struct vme_lm_resource *lm;
@@ -1597,7 +1597,7 @@ EXPORT_SYMBOL(vme_lm_set);
15971597
* errors may also be returned.
15981598
*/
15991599
int vme_lm_get(struct vme_resource *resource, unsigned long long *lm_base,
1600-
u32 *aspace, u32 *cycle)
1600+
u32 *aspace, u32 *cycle)
16011601
{
16021602
struct vme_bridge *bridge = find_bridge(resource);
16031603
struct vme_lm_resource *lm;
@@ -1634,7 +1634,7 @@ EXPORT_SYMBOL(vme_lm_get);
16341634
* errors may also be returned.
16351635
*/
16361636
int vme_lm_attach(struct vme_resource *resource, int monitor,
1637-
void (*callback)(void *), void *data)
1637+
void (*callback)(void *), void *data)
16381638
{
16391639
struct vme_bridge *bridge = find_bridge(resource);
16401640
struct vme_lm_resource *lm;
@@ -1841,7 +1841,8 @@ EXPORT_SYMBOL(vme_unregister_bridge);
18411841
/* - Driver Registration --------------------------------------------------- */
18421842

18431843
static int __vme_register_driver_bus(struct vme_driver *drv,
1844-
struct vme_bridge *bridge, unsigned int ndevs)
1844+
struct vme_bridge *bridge,
1845+
unsigned int ndevs)
18451846
{
18461847
int err;
18471848
unsigned int i;
@@ -1861,7 +1862,7 @@ static int __vme_register_driver_bus(struct vme_driver *drv,
18611862
vdev->dev.parent = bridge->parent;
18621863
vdev->dev.bus = &vme_bus_type;
18631864
dev_set_name(&vdev->dev, "%s.%u-%u", drv->name, bridge->num,
1864-
vdev->num);
1865+
vdev->num);
18651866

18661867
err = device_register(&vdev->dev);
18671868
if (err)

0 commit comments

Comments
 (0)