Re: [PATCH 3/4] drm/ast: Rename struct ast_private to struct ast_device

[Javier Martinez Canillas]

Thomas Zimmermann  writes:

> The data structure struct ast_private represents an AST device. Its
> name comes from the time when it was allocated and stored separately
> in struct drm_device.dev_private. The DRM device is now embedded, so
> rename struct ast_private to struct ast_device.
>
> Signed-off-by: Thomas Zimmermann 
> ---
>  drivers/gpu/drm/ast/ast_dp.c| 10 ++--
>  drivers/gpu/drm/ast/ast_dp501.c | 40 +++---
>  drivers/gpu/drm/ast/ast_drv.c   |  2 +-
>  drivers/gpu/drm/ast/ast_drv.h   | 40 +++---
>  drivers/gpu/drm/ast/ast_i2c.c   |  8 +--
>  drivers/gpu/drm/ast/ast_main.c  | 24 -
>  drivers/gpu/drm/ast/ast_mm.c|  4 +-
>  drivers/gpu/drm/ast/ast_mode.c  | 78 +--
>  drivers/gpu/drm/ast/ast_post.c  | 94 -
>  9 files changed, 150 insertions(+), 150 deletions(-)
>
> diff --git a/drivers/gpu/drm/ast/ast_dp.c b/drivers/gpu/drm/ast/ast_dp.c
> index 56483860306b..9e34297d836d 100644
> --- a/drivers/gpu/drm/ast/ast_dp.c
> +++ b/drivers/gpu/drm/ast/ast_dp.c
> @@ -9,7 +9,7 @@
>  
>  int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)
>  {
> - struct ast_private *ast = to_ast_private(dev);
> + struct ast_device *ast = to_ast_private(dev);

I would just squash patches #3 and #4 and rename the macro as well. There
is no need to have it as two separate patches IMO.

Reviewed-by: Javier Martinez Canillas 

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat

[PATCH 3/4] drm/ast: Rename struct ast_private to struct ast_device

[Thomas Zimmermann]

The data structure struct ast_private represents an AST device. Its
name comes from the time when it was allocated and stored separately
in struct drm_device.dev_private. The DRM device is now embedded, so
rename struct ast_private to struct ast_device.

Signed-off-by: Thomas Zimmermann 
---
 drivers/gpu/drm/ast/ast_dp.c| 10 ++--
 drivers/gpu/drm/ast/ast_dp501.c | 40 +++---
 drivers/gpu/drm/ast/ast_drv.c   |  2 +-
 drivers/gpu/drm/ast/ast_drv.h   | 40 +++---
 drivers/gpu/drm/ast/ast_i2c.c   |  8 +--
 drivers/gpu/drm/ast/ast_main.c  | 24 -
 drivers/gpu/drm/ast/ast_mm.c|  4 +-
 drivers/gpu/drm/ast/ast_mode.c  | 78 +--
 drivers/gpu/drm/ast/ast_post.c  | 94 -
 9 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_dp.c b/drivers/gpu/drm/ast/ast_dp.c
index 56483860306b..9e34297d836d 100644
--- a/drivers/gpu/drm/ast/ast_dp.c
+++ b/drivers/gpu/drm/ast/ast_dp.c
@@ -9,7 +9,7 @@
 
 int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)
 {
-   struct ast_private *ast = to_ast_private(dev);
+   struct ast_device *ast = to_ast_private(dev);
u8 i = 0, j = 0;
 
/*
@@ -125,7 +125,7 @@ void ast_dp_launch(struct drm_device *dev, u8 bPower)
u8 bDPTX = 0;
u8 bDPExecute = 1;
 
-   struct ast_private *ast = to_ast_private(dev);
+   struct ast_device *ast = to_ast_private(dev);
// S3 come back, need more time to wait BMC ready.
if (bPower)
WaitCount = 300;
@@ -172,7 +172,7 @@ void ast_dp_launch(struct drm_device *dev, u8 bPower)
 
 void ast_dp_power_on_off(struct drm_device *dev, bool on)
 {
-   struct ast_private *ast = to_ast_private(dev);
+   struct ast_device *ast = to_ast_private(dev);
// Read and Turn off DP PHY sleep
u8 bE3 = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xE3, 
AST_DP_VIDEO_ENABLE);
 
@@ -188,7 +188,7 @@ void ast_dp_power_on_off(struct drm_device *dev, bool on)
 
 void ast_dp_set_on_off(struct drm_device *dev, bool on)
 {
-   struct ast_private *ast = to_ast_private(dev);
+   struct ast_device *ast = to_ast_private(dev);
u8 video_on_off = on;
 
// Video On/Off
@@ -208,7 +208,7 @@ void ast_dp_set_on_off(struct drm_device *dev, bool on)
 
 void ast_dp_set_mode(struct drm_crtc *crtc, struct ast_vbios_mode_info 
*vbios_mode)
 {
-   struct ast_private *ast = to_ast_private(crtc->dev);
+   struct ast_device *ast = to_ast_private(crtc->dev);
 
u32 ulRefreshRateIndex;
u8 ModeIdx;
diff --git a/drivers/gpu/drm/ast/ast_dp501.c b/drivers/gpu/drm/ast/ast_dp501.c
index 4f75a9efb610..bb56a1c73968 100644
--- a/drivers/gpu/drm/ast/ast_dp501.c
+++ b/drivers/gpu/drm/ast/ast_dp501.c
@@ -10,7 +10,7 @@ MODULE_FIRMWARE("ast_dp501_fw.bin");
 
 static void ast_release_firmware(void *data)
 {
-   struct ast_private *ast = data;
+   struct ast_device *ast = data;
 
release_firmware(ast->dp501_fw);
ast->dp501_fw = NULL;
@@ -18,7 +18,7 @@ static void ast_release_firmware(void *data)
 
 static int ast_load_dp501_microcode(struct drm_device *dev)
 {
-   struct ast_private *ast = to_ast_private(dev);
+   struct ast_device *ast = to_ast_private(dev);
int ret;
 
ret = request_firmware(&ast->dp501_fw, "ast_dp501_fw.bin", dev->dev);
@@ -28,7 +28,7 @@ static int ast_load_dp501_microcode(struct drm_device *dev)
return devm_add_action_or_reset(dev->dev, ast_release_firmware, ast);
 }
 
-static void send_ack(struct ast_private *ast)
+static void send_ack(struct ast_device *ast)
 {
u8 sendack;
sendack = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x9b, 0xff);
@@ -36,7 +36,7 @@ static void send_ack(struct ast_private *ast)
ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x9b, 0x00, sendack);
 }
 
-static void send_nack(struct ast_private *ast)
+static void send_nack(struct ast_device *ast)
 {
u8 sendack;
sendack = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x9b, 0xff);
@@ -44,7 +44,7 @@ static void send_nack(struct ast_private *ast)
ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x9b, 0x00, sendack);
 }
 
-static bool wait_ack(struct ast_private *ast)
+static bool wait_ack(struct ast_device *ast)
 {
u8 waitack;
u32 retry = 0;
@@ -60,7 +60,7 @@ static bool wait_ack(struct ast_private *ast)
return false;
 }
 
-static bool wait_nack(struct ast_private *ast)
+static bool wait_nack(struct ast_device *ast)
 {
u8 waitack;
u32 retry = 0;
@@ -76,18 +76,18 @@ static bool wait_nack(struct ast_private *ast)
return false;
 }
 
-static void set_cmd_trigger(struct ast_private *ast)
+static void set_cmd_trigger(struct ast_device *ast)
 {
ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x9b, ~0x40, 0x40);
 }
 
-static void clear_cmd_trigger(struct ast_private *ast)
+static void clear_cmd_trigger(struct ast_device