Commit 5ed7944d authored by Guenter Roeck's avatar Guenter Roeck Committed by Rob Clark

drm/msm/dp: Drop unnecessary NULL checks after container_of

The result of container_of() operations is never NULL unless the embedded
element is the first element of the structure. This is not the case here.
The NULL check on the result of container_of() is therefore unnecessary
and misleading. Remove it.

This change was made automatically with the following Coccinelle script.

@@
type t;
identifier v;
statement s;
@@

<+...
(
  t v = container_of(...);
|
  v = container_of(...);
)
  ...
  when != v
- if (\( !v \| v == NULL \) ) s
...+>

While at it, remove unused but assigned variable hpd in
dp_display_usbpd_attention_cb().
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210525032033.453143-1-linux@roeck-us.netReviewed-by: default avatarAbhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 08b2a9bb
...@@ -208,10 +208,6 @@ static int dp_display_bind(struct device *dev, struct device *master, ...@@ -208,10 +208,6 @@ static int dp_display_bind(struct device *dev, struct device *master,
dp = container_of(g_dp_display, dp = container_of(g_dp_display,
struct dp_display_private, dp_display); struct dp_display_private, dp_display);
if (!dp) {
DRM_ERROR("DP driver bind failed. Invalid driver data\n");
return -EINVAL;
}
dp->dp_display.drm_dev = drm; dp->dp_display.drm_dev = drm;
priv = drm->dev_private; priv = drm->dev_private;
...@@ -252,10 +248,6 @@ static void dp_display_unbind(struct device *dev, struct device *master, ...@@ -252,10 +248,6 @@ static void dp_display_unbind(struct device *dev, struct device *master,
dp = container_of(g_dp_display, dp = container_of(g_dp_display,
struct dp_display_private, dp_display); struct dp_display_private, dp_display);
if (!dp) {
DRM_ERROR("Invalid DP driver data\n");
return;
}
dp_power_client_deinit(dp->power); dp_power_client_deinit(dp->power);
dp_aux_unregister(dp->aux); dp_aux_unregister(dp->aux);
...@@ -412,11 +404,6 @@ static int dp_display_usbpd_configure_cb(struct device *dev) ...@@ -412,11 +404,6 @@ static int dp_display_usbpd_configure_cb(struct device *dev)
dp = container_of(g_dp_display, dp = container_of(g_dp_display,
struct dp_display_private, dp_display); struct dp_display_private, dp_display);
if (!dp) {
DRM_ERROR("no driver data found\n");
rc = -ENODEV;
goto end;
}
dp_display_host_init(dp, false); dp_display_host_init(dp, false);
...@@ -438,11 +425,6 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev) ...@@ -438,11 +425,6 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev)
dp = container_of(g_dp_display, dp = container_of(g_dp_display,
struct dp_display_private, dp_display); struct dp_display_private, dp_display);
if (!dp) {
DRM_ERROR("no driver data found\n");
rc = -ENODEV;
return rc;
}
dp_add_event(dp, EV_USER_NOTIFICATION, false, 0); dp_add_event(dp, EV_USER_NOTIFICATION, false, 0);
...@@ -511,10 +493,6 @@ static int dp_display_usbpd_attention_cb(struct device *dev) ...@@ -511,10 +493,6 @@ static int dp_display_usbpd_attention_cb(struct device *dev)
dp = container_of(g_dp_display, dp = container_of(g_dp_display,
struct dp_display_private, dp_display); struct dp_display_private, dp_display);
if (!dp) {
DRM_ERROR("no driver data found\n");
return -ENODEV;
}
/* check for any test request issued by sink */ /* check for any test request issued by sink */
rc = dp_link_process_request(dp->link); rc = dp_link_process_request(dp->link);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment