Skip to contentSkip to conversation

drm: remove unneeded break

PATCH In review [email protected] 2 participants 3 messages Oct 19, 2020 – Nov 8, 2020

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: remove unneeded break

From: Tom Rix <[email protected]>

A break is not needed if it is preceded by a return or break

---
 drivers/gpu/drm/mgag200/mgag200_mode.c           | 5 -----
 drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c   | 1 -
 drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c  | 3 ---
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c | 1 -
 drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c  | 1 -
 drivers/gpu/drm/qxl/qxl_ioctl.c                  | 1 -
 6 files changed, 12 deletions(-)
drivers/gpu/drm/mgag200/mgag200_mode.c +0 -5
index 38672f9e5c4f..bbe4e60dfd08 100644
@@ -794,21 +794,16 @@ static int mgag200_crtc_set_plls(struct mga_device *mdev, long clock)
 	case G200_SE_A:
 	case G200_SE_B:
 		return mga_g200se_set_plls(mdev, clock);
-		break;
 	case G200_WB:
 	case G200_EW3:
 		return mga_g200wb_set_plls(mdev, clock);
-		break;
 	case G200_EV:
 		return mga_g200ev_set_plls(mdev, clock);
-		break;
 	case G200_EH:
 	case G200_EH3:
 		return mga_g200eh_set_plls(mdev, clock);
-		break;
 	case G200_ER:
 		return mga_g200er_set_plls(mdev, clock);
-		break;
 	}
 
 	misc = RREG8(MGA_MISC_IN);
drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c +0 -1
index 350f10a3de37..2ec84b8a3b3a 100644
@@ -123,7 +123,6 @@ pll_map(struct nvkm_bios *bios)
 	case NV_20:
 	case NV_30:
 		return nv04_pll_mapping;
-		break;
 	case NV_40:
 		return nv40_pll_mapping;
 	case NV_50:
drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c +0 -3
index efa50274df97..4884eb4a9221 100644
@@ -140,17 +140,14 @@ mcp77_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
 		break;
 	case nv_clk_src_mem:
 		return 0;
-		break;
 	case nv_clk_src_vdec:
 		P = (read_div(clk) & 0x00000700) >> 8;
 
 		switch (mast & 0x00400000) {
 		case 0x00400000:
 			return nvkm_clk_read(&clk->base, nv_clk_src_core) >> P;
-			break;
 		default:
 			return 500000 >> P;
-			break;
 		}
 		break;
 	default:
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c +0 -1
index 2ccb4b6be153..7b1eb44ff3da 100644
@@ -171,7 +171,6 @@ nv50_ram_timing_read(struct nv50_ram *ram, u32 *timing)
 		break;
 	default:
 		return -ENOSYS;
-		break;
 	}
 
 	T(WR) = ((timing[1] >> 24) & 0xff) - 1 - T(CWL);
drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c +0 -1
index e01746ce9fc4..1156634533f9 100644
@@ -90,7 +90,6 @@ gk104_top_oneinit(struct nvkm_top *top)
 		case 0x00000010: B_(NVDEC ); break;
 		case 0x00000013: B_(CE    ); break;
 		case 0x00000014: C_(GSP   ); break;
-			break;
 		default:
 			break;
 		}
drivers/gpu/drm/qxl/qxl_ioctl.c +0 -1
index 5cea6eea72ab..2072ddc9549c 100644
@@ -160,7 +160,6 @@ static int qxl_process_single_command(struct qxl_device *qdev,
 	default:
 		DRM_DEBUG("Only draw commands in execbuffers\n");
 		return -EINVAL;
-		break;
 	}
 
 	if (cmd->command_size > PAGE_SIZE - sizeof(union qxl_release_info))
Signature · 1 line
2.18.1
Acked-by on v1 1/1
#1 lore raw

Hi Tom

Quoted 5 lines · On Mon, Oct 19, 2020 at 09:31:15AM -0700, [email protected] wrote:

From: Tom Rix <[email protected]>

A break is not needed if it is preceded by a return or break

Looks good and builds with no warnings.

One of the diffs made me - "oh this looks wrong". But after I looked again it was right and the resulting code is more readable - so good.

Was tempted to just apply to drm-misc-next but will give others the opportunity to chime in.

Sam

#2 lore raw

Hi Tom

Quoted 10 lines · Sam Ravnborg

Hi Tom

Quoted 5 lines · On Mon, Oct 19, 2020 at 09:31:15AM -0700, [email protected] wrote:

From: Tom Rix <[email protected]>

A break is not needed if it is preceded by a return or break

Looks good and builds with no warnings.

Quoted 7 lines

One of the diffs made me - "oh this looks wrong". But after I looked again it was right and the resulting code is more readable - so good.

Was tempted to just apply to drm-misc-next but will give others the opportunity to chime in.

Thanks.
Now applied to drm-misc-next - will show up in -next in a week or so.

Sam