drm/mgag200: Rename G200WB prepare/commit function

Thomas Zimmermann · Thomas Zimmermann · commit 904347fb5ab4 · 2020-07-14T09:14:06.000+02:00
The prepare and commit helpers for G200WB devices control the BMC. Rename them accordingly. While at it, also change the passed value's type to struct mga_device and remove some type upcasting. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Lyude Paul <lyude@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200707082411.6583-7-tzimmermann@suse.de
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -745,9 +745,8 @@ static int mgag200_crtc_set_plls(struct mga_device *mdev, long clock)
 	return 0;
 }
 
-static void mga_g200wb_prepare(struct drm_crtc *crtc)
+static void mgag200_g200wb_hold_bmc(struct mga_device *mdev)
 {
-	struct mga_device *mdev = to_mga_device(crtc->dev);
 	u8 tmp;
 	int iter_max;
 
@@ -799,10 +798,9 @@ static void mga_g200wb_prepare(struct drm_crtc *crtc)
 	}
 }
 
-static void mga_g200wb_commit(struct drm_crtc *crtc)
+static void mgag200_g200wb_release_bmc(struct mga_device *mdev)
 {
 	u8 tmp;
-	struct mga_device *mdev = to_mga_device(crtc->dev);
 
 	/* 1- The first step is to ensure that the vrsten and hrsten are set */
 	WREG8(MGAREG_CRTCEXT_INDEX, 1);
@@ -1348,7 +1346,7 @@ static void mga_crtc_prepare(struct drm_crtc *crtc)
 	struct mga_device *mdev = to_mga_device(dev);
 
 	if (mdev->type == G200_WB || mdev->type == G200_EW3)
-		mga_g200wb_prepare(crtc);
+		mgag200_g200wb_hold_bmc(mdev);
 }
 
 /*
@@ -1361,7 +1359,7 @@ static void mga_crtc_commit(struct drm_crtc *crtc)
 	struct mga_device *mdev = to_mga_device(dev);
 
 	if (mdev->type == G200_WB || mdev->type == G200_EW3)
-		mga_g200wb_commit(crtc);
+		mgag200_g200wb_release_bmc(mdev);
 
 	mga_crtc_load_lut(crtc);
 	mgag200_enable_display(mdev);

Original file line number	Diff line number	Diff line change
`@@ -745,9 +745,8 @@ static int mgag200_crtc_set_plls(struct mga_device *mdev, long clock)`
`745`	`745`	`return 0;`
`746`	`746`	`}`
`747`	`747`
`748`		`-static void mga_g200wb_prepare(struct drm_crtc *crtc)`
	`748`	`+static void mgag200_g200wb_hold_bmc(struct mga_device *mdev)`
`749`	`749`	`{`
`750`		`- struct mga_device *mdev = to_mga_device(crtc->dev);`
`751`	`750`	`u8 tmp;`
`752`	`751`	`int iter_max;`
`753`	`752`
`@@ -799,10 +798,9 @@ static void mga_g200wb_prepare(struct drm_crtc *crtc)`
`799`	`798`	`}`
`800`	`799`	`}`
`801`	`800`
`802`		`-static void mga_g200wb_commit(struct drm_crtc *crtc)`
	`801`	`+static void mgag200_g200wb_release_bmc(struct mga_device *mdev)`
`803`	`802`	`{`
`804`	`803`	`u8 tmp;`
`805`		`- struct mga_device *mdev = to_mga_device(crtc->dev);`
`806`	`804`
`807`	`805`	`/* 1- The first step is to ensure that the vrsten and hrsten are set */`
`808`	`806`	`WREG8(MGAREG_CRTCEXT_INDEX, 1);`
`@@ -1348,7 +1346,7 @@ static void mga_crtc_prepare(struct drm_crtc *crtc)`
`1348`	`1346`	`struct mga_device *mdev = to_mga_device(dev);`
`1349`	`1347`
`1350`	`1348`	`if (mdev->type == G200_WB \|\| mdev->type == G200_EW3)`
`1351`		`- mga_g200wb_prepare(crtc);`
	`1349`	`+ mgag200_g200wb_hold_bmc(mdev);`
`1352`	`1350`	`}`
`1353`	`1351`
`1354`	`1352`	`/*`
`@@ -1361,7 +1359,7 @@ static void mga_crtc_commit(struct drm_crtc *crtc)`
`1361`	`1359`	`struct mga_device *mdev = to_mga_device(dev);`
`1362`	`1360`
`1363`	`1361`	`if (mdev->type == G200_WB \|\| mdev->type == G200_EW3)`
`1364`		`- mga_g200wb_commit(crtc);`
	`1362`	`+ mgag200_g200wb_release_bmc(mdev);`
`1365`	`1363`
`1366`	`1364`	`mga_crtc_load_lut(crtc);`
`1367`	`1365`	`mgag200_enable_display(mdev);`