7d649cfe03
Fix an incorrect NULL check reported by kbot in the MSM DP driver smatch warnings: drivers/gpu/drm/msm/dp/dp_hpd.c:37 dp_hpd_connect() error: we previously assumed 'hpd_priv->dp_cb' could be null (see line 37) Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/1614971839-2686-2-git-send-email-abhinavk@codeaurora.org Signed-off-by: Rob Clark <robdclark@chromium.org>
69 lines
1.4 KiB
C
69 lines
1.4 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) "[drm-dp] %s: " fmt, __func__
|
|
|
|
#include <linux/slab.h>
|
|
#include <linux/device.h>
|
|
|
|
#include "dp_hpd.h"
|
|
|
|
/* DP specific VDM commands */
|
|
#define DP_USBPD_VDM_STATUS 0x10
|
|
#define DP_USBPD_VDM_CONFIGURE 0x11
|
|
|
|
/* USBPD-TypeC specific Macros */
|
|
#define VDM_VERSION 0x0
|
|
#define USB_C_DP_SID 0xFF01
|
|
|
|
struct dp_hpd_private {
|
|
struct device *dev;
|
|
struct dp_usbpd_cb *dp_cb;
|
|
struct dp_usbpd dp_usbpd;
|
|
};
|
|
|
|
int dp_hpd_connect(struct dp_usbpd *dp_usbpd, bool hpd)
|
|
{
|
|
int rc = 0;
|
|
struct dp_hpd_private *hpd_priv;
|
|
|
|
hpd_priv = container_of(dp_usbpd, struct dp_hpd_private,
|
|
dp_usbpd);
|
|
|
|
dp_usbpd->hpd_high = hpd;
|
|
|
|
if (!hpd_priv->dp_cb || !hpd_priv->dp_cb->configure
|
|
|| !hpd_priv->dp_cb->disconnect) {
|
|
pr_err("hpd dp_cb not initialized\n");
|
|
return -EINVAL;
|
|
}
|
|
if (hpd)
|
|
hpd_priv->dp_cb->configure(hpd_priv->dev);
|
|
else
|
|
hpd_priv->dp_cb->disconnect(hpd_priv->dev);
|
|
|
|
return rc;
|
|
}
|
|
|
|
struct dp_usbpd *dp_hpd_get(struct device *dev, struct dp_usbpd_cb *cb)
|
|
{
|
|
struct dp_hpd_private *dp_hpd;
|
|
|
|
if (!cb) {
|
|
pr_err("invalid cb data\n");
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
dp_hpd = devm_kzalloc(dev, sizeof(*dp_hpd), GFP_KERNEL);
|
|
if (!dp_hpd)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
dp_hpd->dev = dev;
|
|
dp_hpd->dp_cb = cb;
|
|
|
|
dp_hpd->dp_usbpd.connect = dp_hpd_connect;
|
|
|
|
return &dp_hpd->dp_usbpd;
|
|
}
|