niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/nouveau: Fix brace placement checkpatch.pl errors.

Browse source 
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>
This commit is contained in:
Emil Velikov 2011-03-19 23:31:53 +00:00 • committed by Ben Skeggs
parent f212949ced
commit f9ec8f6c8d
6 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/nv04_crtc.c
View file

@ -790,8 +790,7 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,
if (atomic) { if (atomic) {
drm_fb = passed_fb; drm_fb = passed_fb;
fb = nouveau_framebuffer(passed_fb); fb = nouveau_framebuffer(passed_fb);
} } else {
else {
/* If not atomic, we can go ahead and pin, and unpin the /* If not atomic, we can go ahead and pin, and unpin the
* old fb we were passed. * old fb we were passed.
*/ */

6
drivers/gpu/drm/nouveau/nv04_graph.c
View file

@ -1232,8 +1232,7 @@ static struct nouveau_bitfield nv04_graph_intr[] = {
{} {}
}; };
static struct nouveau_bitfield nv04_graph_nstatus[] = static struct nouveau_bitfield nv04_graph_nstatus[] = {
{
{ NV04_PGRAPH_NSTATUS_STATE_IN_USE, "STATE_IN_USE" }, { NV04_PGRAPH_NSTATUS_STATE_IN_USE, "STATE_IN_USE" },
{ NV04_PGRAPH_NSTATUS_INVALID_STATE, "INVALID_STATE" }, { NV04_PGRAPH_NSTATUS_INVALID_STATE, "INVALID_STATE" },
{ NV04_PGRAPH_NSTATUS_BAD_ARGUMENT, "BAD_ARGUMENT" }, { NV04_PGRAPH_NSTATUS_BAD_ARGUMENT, "BAD_ARGUMENT" },
@ -1241,8 +1240,7 @@ static struct nouveau_bitfield nv04_graph_nstatus[] =
{} {}
}; };
struct nouveau_bitfield nv04_graph_nsource[] = struct nouveau_bitfield nv04_graph_nsource[] = {
{
{ NV03_PGRAPH_NSOURCE_NOTIFICATION, "NOTIFICATION" }, { NV03_PGRAPH_NSOURCE_NOTIFICATION, "NOTIFICATION" },
{ NV03_PGRAPH_NSOURCE_DATA_ERROR, "DATA_ERROR" }, { NV03_PGRAPH_NSOURCE_DATA_ERROR, "DATA_ERROR" },
{ NV03_PGRAPH_NSOURCE_PROTECTION_ERROR, "PROTECTION_ERROR" }, { NV03_PGRAPH_NSOURCE_PROTECTION_ERROR, "PROTECTION_ERROR" },

3
drivers/gpu/drm/nouveau/nv10_graph.c
View file

@ -1117,8 +1117,7 @@ struct nouveau_bitfield nv10_graph_intr[] = {
{} {}
}; };
struct nouveau_bitfield nv10_graph_nstatus[] = struct nouveau_bitfield nv10_graph_nstatus[] = {
{
{ NV10_PGRAPH_NSTATUS_STATE_IN_USE, "STATE_IN_USE" }, { NV10_PGRAPH_NSTATUS_STATE_IN_USE, "STATE_IN_USE" },
{ NV10_PGRAPH_NSTATUS_INVALID_STATE, "INVALID_STATE" }, { NV10_PGRAPH_NSTATUS_INVALID_STATE, "INVALID_STATE" },
{ NV10_PGRAPH_NSTATUS_BAD_ARGUMENT, "BAD_ARGUMENT" }, { NV10_PGRAPH_NSTATUS_BAD_ARGUMENT, "BAD_ARGUMENT" },

3
drivers/gpu/drm/nouveau/nv50_crtc.c
View file

@ -532,8 +532,7 @@ nv50_crtc_do_mode_set_base(struct drm_crtc *crtc,
if (atomic) { if (atomic) {
drm_fb = passed_fb; drm_fb = passed_fb;
fb = nouveau_framebuffer(passed_fb); fb = nouveau_framebuffer(passed_fb);
} } else {
else {
/* If not atomic, we can go ahead and pin, and unpin the /* If not atomic, we can go ahead and pin, and unpin the
* old fb we were passed. * old fb we were passed.
*/ */

3
drivers/gpu/drm/nouveau/nv50_graph.c
View file

@ -548,8 +548,7 @@ nv84_graph_tlb_flush(struct drm_device *dev)
spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags); spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);
} }
static struct nouveau_enum nv50_mp_exec_error_names[] = static struct nouveau_enum nv50_mp_exec_error_names[] = {
{
{ 3, "STACK_UNDERFLOW", NULL }, { 3, "STACK_UNDERFLOW", NULL },
{ 4, "QUADON_ACTIVE", NULL }, { 4, "QUADON_ACTIVE", NULL },
{ 8, "TIMEOUT", NULL }, { 8, "TIMEOUT", NULL },

4
drivers/gpu/drm/nouveau/nv50_grctx.c
View file

@ -1803,9 +1803,7 @@ nv50_graph_construct_gene_unk24xx(struct nouveau_grctx *ctx)
xf_emit(ctx, 1, 0); /* 1ff */ xf_emit(ctx, 1, 0); /* 1ff */
xf_emit(ctx, 8, 0); /* 0? */ xf_emit(ctx, 8, 0); /* 0? */
xf_emit(ctx, 9, 0); /* ffffffff, 7ff */ xf_emit(ctx, 9, 0); /* ffffffff, 7ff */
} } else {
else
{
xf_emit(ctx, 0xc, 0); /* RO */ xf_emit(ctx, 0xc, 0); /* RO */
/* SEEK */ /* SEEK */
xf_emit(ctx, 0xe10, 0); /* 190 * 9: 8*ffffffff, 7ff */ xf_emit(ctx, 0xe10, 0); /* 190 * 9: 8*ffffffff, 7ff */