Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9ec8f6c authored by Emil Velikov's avatar Emil Velikov Committed by Ben Skeggs
Browse files

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: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
parent f212949c

drivers/gpu/drm/nouveau/nv04_crtc.c

+1 −2
Original line number Diff line number Diff line
@@ -790,8 +790,7 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, 
	if (atomic) {

		drm_fb = passed_fb;

		fb = nouveau_framebuffer(passed_fb);

	}

	else {

	} else {

		/* If not atomic, we can go ahead and pin, and unpin the

		 * old fb we were passed.

		 */

drivers/gpu/drm/nouveau/nv04_graph.c

+2 −4
Original line number Diff line number Diff line
@@ -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_INVALID_STATE,      "INVALID_STATE" },

	{ 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_DATA_ERROR,         "DATA_ERROR" },

	{ NV03_PGRAPH_NSOURCE_PROTECTION_ERROR,   "PROTECTION_ERROR" },

drivers/gpu/drm/nouveau/nv10_graph.c

+1 −2
Original line number Diff line number Diff line
@@ -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_INVALID_STATE,      "INVALID_STATE" },

	{ NV10_PGRAPH_NSTATUS_BAD_ARGUMENT,       "BAD_ARGUMENT" },

drivers/gpu/drm/nouveau/nv50_crtc.c

+1 −2
Original line number Diff line number Diff line
@@ -532,8 +532,7 @@ nv50_crtc_do_mode_set_base(struct drm_crtc *crtc, 
	if (atomic) {

		drm_fb = passed_fb;

		fb = nouveau_framebuffer(passed_fb);

	}

	else {

	} else {

		/* If not atomic, we can go ahead and pin, and unpin the

		 * old fb we were passed.

		 */

drivers/gpu/drm/nouveau/nv50_graph.c

+1 −2
Original line number Diff line number Diff line
@@ -548,8 +548,7 @@ nv84_graph_tlb_flush(struct drm_device *dev) 
	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 },

	{ 4, "QUADON_ACTIVE", NULL },

	{ 8, "TIMEOUT", NULL },