diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2011-03-19 19:31:53 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-05-15 20:47:19 -0400 |
commit | f9ec8f6c8dea942bc4be5cc1f34c99df7a4d78ee (patch) | |
tree | 9b99c6478811f093eecbf2f635ee6ee80d92c510 | |
parent | f212949ced2397b5f00e987bb5d4bb34dc69cc8d (diff) |
drm/nouveau: Fix brace placement checkpatch.pl errors.
Fix 'ERROR: that open brace { should be on the previous line'
Fix 'ERROR: else should follow close brace }'
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
-rw-r--r-- | drivers/gpu/drm/nouveau/nv04_crtc.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nv04_graph.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nv10_graph.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_crtc.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_graph.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_grctx.c | 4 |
6 files changed, 7 insertions, 15 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c index 748b9d9c2949..cc3cd175ab9d 100644 --- a/drivers/gpu/drm/nouveau/nv04_crtc.c +++ b/drivers/gpu/drm/nouveau/nv04_crtc.c | |||
@@ -790,8 +790,7 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, | |||
790 | if (atomic) { | 790 | if (atomic) { |
791 | drm_fb = passed_fb; | 791 | drm_fb = passed_fb; |
792 | fb = nouveau_framebuffer(passed_fb); | 792 | fb = nouveau_framebuffer(passed_fb); |
793 | } | 793 | } else { |
794 | else { | ||
795 | /* If not atomic, we can go ahead and pin, and unpin the | 794 | /* If not atomic, we can go ahead and pin, and unpin the |
796 | * old fb we were passed. | 795 | * old fb we were passed. |
797 | */ | 796 | */ |
diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c index c624ae9e9ed3..055677a2eea2 100644 --- a/drivers/gpu/drm/nouveau/nv04_graph.c +++ b/drivers/gpu/drm/nouveau/nv04_graph.c | |||
@@ -1232,8 +1232,7 @@ static struct nouveau_bitfield nv04_graph_intr[] = { | |||
1232 | {} | 1232 | {} |
1233 | }; | 1233 | }; |
1234 | 1234 | ||
1235 | static struct nouveau_bitfield nv04_graph_nstatus[] = | 1235 | static struct nouveau_bitfield nv04_graph_nstatus[] = { |
1236 | { | ||
1237 | { NV04_PGRAPH_NSTATUS_STATE_IN_USE, "STATE_IN_USE" }, | 1236 | { NV04_PGRAPH_NSTATUS_STATE_IN_USE, "STATE_IN_USE" }, |
1238 | { NV04_PGRAPH_NSTATUS_INVALID_STATE, "INVALID_STATE" }, | 1237 | { NV04_PGRAPH_NSTATUS_INVALID_STATE, "INVALID_STATE" }, |
1239 | { NV04_PGRAPH_NSTATUS_BAD_ARGUMENT, "BAD_ARGUMENT" }, | 1238 | { NV04_PGRAPH_NSTATUS_BAD_ARGUMENT, "BAD_ARGUMENT" }, |
@@ -1241,8 +1240,7 @@ static struct nouveau_bitfield nv04_graph_nstatus[] = | |||
1241 | {} | 1240 | {} |
1242 | }; | 1241 | }; |
1243 | 1242 | ||
1244 | struct nouveau_bitfield nv04_graph_nsource[] = | 1243 | struct nouveau_bitfield nv04_graph_nsource[] = { |
1245 | { | ||
1246 | { NV03_PGRAPH_NSOURCE_NOTIFICATION, "NOTIFICATION" }, | 1244 | { NV03_PGRAPH_NSOURCE_NOTIFICATION, "NOTIFICATION" }, |
1247 | { NV03_PGRAPH_NSOURCE_DATA_ERROR, "DATA_ERROR" }, | 1245 | { NV03_PGRAPH_NSOURCE_DATA_ERROR, "DATA_ERROR" }, |
1248 | { NV03_PGRAPH_NSOURCE_PROTECTION_ERROR, "PROTECTION_ERROR" }, | 1246 | { NV03_PGRAPH_NSOURCE_PROTECTION_ERROR, "PROTECTION_ERROR" }, |
diff --git a/drivers/gpu/drm/nouveau/nv10_graph.c b/drivers/gpu/drm/nouveau/nv10_graph.c index 8c92edb7bbcd..531d7ba58884 100644 --- a/drivers/gpu/drm/nouveau/nv10_graph.c +++ b/drivers/gpu/drm/nouveau/nv10_graph.c | |||
@@ -1117,8 +1117,7 @@ struct nouveau_bitfield nv10_graph_intr[] = { | |||
1117 | {} | 1117 | {} |
1118 | }; | 1118 | }; |
1119 | 1119 | ||
1120 | struct nouveau_bitfield nv10_graph_nstatus[] = | 1120 | struct nouveau_bitfield nv10_graph_nstatus[] = { |
1121 | { | ||
1122 | { NV10_PGRAPH_NSTATUS_STATE_IN_USE, "STATE_IN_USE" }, | 1121 | { NV10_PGRAPH_NSTATUS_STATE_IN_USE, "STATE_IN_USE" }, |
1123 | { NV10_PGRAPH_NSTATUS_INVALID_STATE, "INVALID_STATE" }, | 1122 | { NV10_PGRAPH_NSTATUS_INVALID_STATE, "INVALID_STATE" }, |
1124 | { NV10_PGRAPH_NSTATUS_BAD_ARGUMENT, "BAD_ARGUMENT" }, | 1123 | { NV10_PGRAPH_NSTATUS_BAD_ARGUMENT, "BAD_ARGUMENT" }, |
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c index a19ccaa025b3..e900a5135a00 100644 --- a/drivers/gpu/drm/nouveau/nv50_crtc.c +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c | |||
@@ -532,8 +532,7 @@ nv50_crtc_do_mode_set_base(struct drm_crtc *crtc, | |||
532 | if (atomic) { | 532 | if (atomic) { |
533 | drm_fb = passed_fb; | 533 | drm_fb = passed_fb; |
534 | fb = nouveau_framebuffer(passed_fb); | 534 | fb = nouveau_framebuffer(passed_fb); |
535 | } | 535 | } else { |
536 | else { | ||
537 | /* If not atomic, we can go ahead and pin, and unpin the | 536 | /* If not atomic, we can go ahead and pin, and unpin the |
538 | * old fb we were passed. | 537 | * old fb we were passed. |
539 | */ | 538 | */ |
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index b02a5b1e7d37..7289cbac05b2 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c | |||
@@ -548,8 +548,7 @@ nv84_graph_tlb_flush(struct drm_device *dev) | |||
548 | spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags); | 548 | spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags); |
549 | } | 549 | } |
550 | 550 | ||
551 | static struct nouveau_enum nv50_mp_exec_error_names[] = | 551 | static struct nouveau_enum nv50_mp_exec_error_names[] = { |
552 | { | ||
553 | { 3, "STACK_UNDERFLOW", NULL }, | 552 | { 3, "STACK_UNDERFLOW", NULL }, |
554 | { 4, "QUADON_ACTIVE", NULL }, | 553 | { 4, "QUADON_ACTIVE", NULL }, |
555 | { 8, "TIMEOUT", NULL }, | 554 | { 8, "TIMEOUT", NULL }, |
diff --git a/drivers/gpu/drm/nouveau/nv50_grctx.c b/drivers/gpu/drm/nouveau/nv50_grctx.c index ac9f1369c488..de9abff12b90 100644 --- a/drivers/gpu/drm/nouveau/nv50_grctx.c +++ b/drivers/gpu/drm/nouveau/nv50_grctx.c | |||
@@ -1803,9 +1803,7 @@ nv50_graph_construct_gene_unk24xx(struct nouveau_grctx *ctx) | |||
1803 | xf_emit(ctx, 1, 0); /* 1ff */ | 1803 | xf_emit(ctx, 1, 0); /* 1ff */ |
1804 | xf_emit(ctx, 8, 0); /* 0? */ | 1804 | xf_emit(ctx, 8, 0); /* 0? */ |
1805 | xf_emit(ctx, 9, 0); /* ffffffff, 7ff */ | 1805 | xf_emit(ctx, 9, 0); /* ffffffff, 7ff */ |
1806 | } | 1806 | } else { |
1807 | else | ||
1808 | { | ||
1809 | xf_emit(ctx, 0xc, 0); /* RO */ | 1807 | xf_emit(ctx, 0xc, 0); /* RO */ |
1810 | /* SEEK */ | 1808 | /* SEEK */ |
1811 | xf_emit(ctx, 0xe10, 0); /* 190 * 9: 8*ffffffff, 7ff */ | 1809 | xf_emit(ctx, 0xe10, 0); /* 190 * 9: 8*ffffffff, 7ff */ |