drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
Clean up a few logged messages, which were previously worded as rather
incomplete sentences separated by periods. This was both a bit unreadable
and grammatically incorrect, so convert them into partial sentences separated
(or connected) by semicolons, together with some wording improvements.
Signed-off-by: Dragan Simic <dsimic@manjaro.org>
---
drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index bd7aa891b839..ee9def197095 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -969,46 +969,44 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
/* Not connected, notify userspace to disable the block */
if (!cdn_dp_connected_port(dp)) {
- DRM_DEV_INFO(dp->dev, "Not connected. Disabling cdn\n");
+ DRM_DEV_INFO(dp->dev, "Not connected; disabling cdn\n");
dp->connected = false;
/* Connected but not enabled, enable the block */
} else if (!dp->active) {
- DRM_DEV_INFO(dp->dev, "Connected, not enabled. Enabling cdn\n");
+ DRM_DEV_INFO(dp->dev, "Connected, not enabled; enabling cdn\n");
ret = cdn_dp_enable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Enable dp failed %d\n", ret);
+ DRM_DEV_ERROR(dp->dev, "Enabling dp failed: %d\n", ret);
dp->connected = false;
}
/* Enabled and connected to a dongle without a sink, notify userspace */
} else if (!cdn_dp_check_sink_connection(dp)) {
- DRM_DEV_INFO(dp->dev, "Connected without sink. Assert hpd\n");
+ DRM_DEV_INFO(dp->dev, "Connected without sink; assert hpd\n");
dp->connected = false;
/* Enabled and connected with a sink, re-train if requested */
} else if (!cdn_dp_check_link_status(dp)) {
unsigned int rate = dp->max_rate;
unsigned int lanes = dp->max_lanes;
struct drm_display_mode *mode = &dp->mode;
- DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n");
+ DRM_DEV_INFO(dp->dev, "Connected with sink; re-train link\n");
ret = cdn_dp_train_link(dp);
if (ret) {
dp->connected = false;
- DRM_DEV_ERROR(dp->dev, "Train link failed %d\n", ret);
+ DRM_DEV_ERROR(dp->dev, "Training link failed: %d\n", ret);
goto out;
}
/* If training result is changed, update the video config */
if (mode->clock &&
(rate != dp->max_rate || lanes != dp->max_lanes)) {
ret = cdn_dp_config_video(dp);
if (ret) {
dp->connected = false;
- DRM_DEV_ERROR(dp->dev,
- "Failed to config video %d\n",
- ret);
+ DRM_DEV_ERROR(dp->dev, "Failed to configure video: %d\n", ret);
}
}
}
On Thu, 4 Jul 2024 01:32:20 +0200, Dragan Simic wrote:
> Clean up a few logged messages, which were previously worded as rather
> incomplete sentences separated by periods. This was both a bit unreadable
> and grammatically incorrect, so convert them into partial sentences separated
> (or connected) by semicolons, together with some wording improvements.
>
>
Applied, thanks!
[1/1] drm/rockchip: cdn-dp: Clean up a few logged messages
commit: f7f4df8851194d2635fb7989582014329dcffa12
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
Hello Dragan,
At 2024-07-04 07:32:20, "Dragan Simic" <dsimic@manjaro.org> wrote:
>Clean up a few logged messages, which were previously worded as rather
>incomplete sentences separated by periods. This was both a bit unreadable
>and grammatically incorrect, so convert them into partial sentences separated
>(or connected) by semicolons, together with some wording improvements.
>
>Signed-off-by: Dragan Simic <dsimic@manjaro.org>
Reviewed-by: Andy Yan <andyshrk@163.com>
>---
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
>index bd7aa891b839..ee9def197095 100644
>--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
>+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
>@@ -969,46 +969,44 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
>
> /* Not connected, notify userspace to disable the block */
> if (!cdn_dp_connected_port(dp)) {
>- DRM_DEV_INFO(dp->dev, "Not connected. Disabling cdn\n");
>+ DRM_DEV_INFO(dp->dev, "Not connected; disabling cdn\n");
> dp->connected = false;
>
> /* Connected but not enabled, enable the block */
> } else if (!dp->active) {
>- DRM_DEV_INFO(dp->dev, "Connected, not enabled. Enabling cdn\n");
>+ DRM_DEV_INFO(dp->dev, "Connected, not enabled; enabling cdn\n");
> ret = cdn_dp_enable(dp);
> if (ret) {
>- DRM_DEV_ERROR(dp->dev, "Enable dp failed %d\n", ret);
>+ DRM_DEV_ERROR(dp->dev, "Enabling dp failed: %d\n", ret);
> dp->connected = false;
> }
>
> /* Enabled and connected to a dongle without a sink, notify userspace */
> } else if (!cdn_dp_check_sink_connection(dp)) {
>- DRM_DEV_INFO(dp->dev, "Connected without sink. Assert hpd\n");
>+ DRM_DEV_INFO(dp->dev, "Connected without sink; assert hpd\n");
> dp->connected = false;
>
> /* Enabled and connected with a sink, re-train if requested */
> } else if (!cdn_dp_check_link_status(dp)) {
> unsigned int rate = dp->max_rate;
> unsigned int lanes = dp->max_lanes;
> struct drm_display_mode *mode = &dp->mode;
>
>- DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n");
>+ DRM_DEV_INFO(dp->dev, "Connected with sink; re-train link\n");
> ret = cdn_dp_train_link(dp);
> if (ret) {
> dp->connected = false;
>- DRM_DEV_ERROR(dp->dev, "Train link failed %d\n", ret);
>+ DRM_DEV_ERROR(dp->dev, "Training link failed: %d\n", ret);
> goto out;
> }
>
> /* If training result is changed, update the video config */
> if (mode->clock &&
> (rate != dp->max_rate || lanes != dp->max_lanes)) {
> ret = cdn_dp_config_video(dp);
> if (ret) {
> dp->connected = false;
>- DRM_DEV_ERROR(dp->dev,
>- "Failed to config video %d\n",
>- ret);
>+ DRM_DEV_ERROR(dp->dev, "Failed to configure video: %d\n", ret);
> }
> }
> }
Hello all,
Just checking, is this patch good enough to be accepted? If not, is
there
some other preferred way for cleaning up the produced messages?
On 2024-07-04 01:32, Dragan Simic wrote:
> Clean up a few logged messages, which were previously worded as rather
> incomplete sentences separated by periods. This was both a bit
> unreadable
> and grammatically incorrect, so convert them into partial sentences
> separated
> (or connected) by semicolons, together with some wording improvements.
>
> Signed-off-by: Dragan Simic <dsimic@manjaro.org>
> ---
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index bd7aa891b839..ee9def197095 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -969,46 +969,44 @@ static void cdn_dp_pd_event_work(struct
> work_struct *work)
>
> /* Not connected, notify userspace to disable the block */
> if (!cdn_dp_connected_port(dp)) {
> - DRM_DEV_INFO(dp->dev, "Not connected. Disabling cdn\n");
> + DRM_DEV_INFO(dp->dev, "Not connected; disabling cdn\n");
> dp->connected = false;
>
> /* Connected but not enabled, enable the block */
> } else if (!dp->active) {
> - DRM_DEV_INFO(dp->dev, "Connected, not enabled. Enabling cdn\n");
> + DRM_DEV_INFO(dp->dev, "Connected, not enabled; enabling cdn\n");
> ret = cdn_dp_enable(dp);
> if (ret) {
> - DRM_DEV_ERROR(dp->dev, "Enable dp failed %d\n", ret);
> + DRM_DEV_ERROR(dp->dev, "Enabling dp failed: %d\n", ret);
> dp->connected = false;
> }
>
> /* Enabled and connected to a dongle without a sink, notify userspace
> */
> } else if (!cdn_dp_check_sink_connection(dp)) {
> - DRM_DEV_INFO(dp->dev, "Connected without sink. Assert hpd\n");
> + DRM_DEV_INFO(dp->dev, "Connected without sink; assert hpd\n");
> dp->connected = false;
>
> /* Enabled and connected with a sink, re-train if requested */
> } else if (!cdn_dp_check_link_status(dp)) {
> unsigned int rate = dp->max_rate;
> unsigned int lanes = dp->max_lanes;
> struct drm_display_mode *mode = &dp->mode;
>
> - DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n");
> + DRM_DEV_INFO(dp->dev, "Connected with sink; re-train link\n");
> ret = cdn_dp_train_link(dp);
> if (ret) {
> dp->connected = false;
> - DRM_DEV_ERROR(dp->dev, "Train link failed %d\n", ret);
> + DRM_DEV_ERROR(dp->dev, "Training link failed: %d\n", ret);
> goto out;
> }
>
> /* If training result is changed, update the video config */
> if (mode->clock &&
> (rate != dp->max_rate || lanes != dp->max_lanes)) {
> ret = cdn_dp_config_video(dp);
> if (ret) {
> dp->connected = false;
> - DRM_DEV_ERROR(dp->dev,
> - "Failed to config video %d\n",
> - ret);
> + DRM_DEV_ERROR(dp->dev, "Failed to configure video: %d\n", ret);
> }
> }
> }
On 2024-07-25 11:33, Dragan Simic wrote:
> Hello all,
>
> Just checking, is this patch good enough to be accepted? If not, is
> there
> some other preferred way for cleaning up the produced messages?
Just a brief reminder...
> On 2024-07-04 01:32, Dragan Simic wrote:
>> Clean up a few logged messages, which were previously worded as rather
>> incomplete sentences separated by periods. This was both a bit
>> unreadable
>> and grammatically incorrect, so convert them into partial sentences
>> separated
>> (or connected) by semicolons, together with some wording improvements.
>>
>> Signed-off-by: Dragan Simic <dsimic@manjaro.org>
>> ---
>> drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +++++++---------
>> 1 file changed, 7 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c
>> b/drivers/gpu/drm/rockchip/cdn-dp-core.c
>> index bd7aa891b839..ee9def197095 100644
>> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
>> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
>> @@ -969,46 +969,44 @@ static void cdn_dp_pd_event_work(struct
>> work_struct *work)
>>
>> /* Not connected, notify userspace to disable the block */
>> if (!cdn_dp_connected_port(dp)) {
>> - DRM_DEV_INFO(dp->dev, "Not connected. Disabling cdn\n");
>> + DRM_DEV_INFO(dp->dev, "Not connected; disabling cdn\n");
>> dp->connected = false;
>>
>> /* Connected but not enabled, enable the block */
>> } else if (!dp->active) {
>> - DRM_DEV_INFO(dp->dev, "Connected, not enabled. Enabling cdn\n");
>> + DRM_DEV_INFO(dp->dev, "Connected, not enabled; enabling cdn\n");
>> ret = cdn_dp_enable(dp);
>> if (ret) {
>> - DRM_DEV_ERROR(dp->dev, "Enable dp failed %d\n", ret);
>> + DRM_DEV_ERROR(dp->dev, "Enabling dp failed: %d\n", ret);
>> dp->connected = false;
>> }
>>
>> /* Enabled and connected to a dongle without a sink, notify
>> userspace */
>> } else if (!cdn_dp_check_sink_connection(dp)) {
>> - DRM_DEV_INFO(dp->dev, "Connected without sink. Assert hpd\n");
>> + DRM_DEV_INFO(dp->dev, "Connected without sink; assert hpd\n");
>> dp->connected = false;
>>
>> /* Enabled and connected with a sink, re-train if requested */
>> } else if (!cdn_dp_check_link_status(dp)) {
>> unsigned int rate = dp->max_rate;
>> unsigned int lanes = dp->max_lanes;
>> struct drm_display_mode *mode = &dp->mode;
>>
>> - DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n");
>> + DRM_DEV_INFO(dp->dev, "Connected with sink; re-train link\n");
>> ret = cdn_dp_train_link(dp);
>> if (ret) {
>> dp->connected = false;
>> - DRM_DEV_ERROR(dp->dev, "Train link failed %d\n", ret);
>> + DRM_DEV_ERROR(dp->dev, "Training link failed: %d\n", ret);
>> goto out;
>> }
>>
>> /* If training result is changed, update the video config */
>> if (mode->clock &&
>> (rate != dp->max_rate || lanes != dp->max_lanes)) {
>> ret = cdn_dp_config_video(dp);
>> if (ret) {
>> dp->connected = false;
>> - DRM_DEV_ERROR(dp->dev,
>> - "Failed to config video %d\n",
>> - ret);
>> + DRM_DEV_ERROR(dp->dev, "Failed to configure video: %d\n", ret);
>> }
>> }
>> }
© 2016 - 2026 Red Hat, Inc.