From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vivek Gautam Subject: Re: [PATCH 2/3] drm/exynos: dp: Remove support for unused dptx-phy Date: Thu, 30 Oct 2014 18:49:58 +0530 Message-ID: References: <1410786785-9838-1-git-send-email-gautam.vivek@samsung.com> <1410786785-9838-3-git-send-email-gautam.vivek@samsung.com> <54522CF7.6030302@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <54522CF7.6030302@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org To: Inki Dae Cc: "dri-devel@lists.freedesktop.org" , "linux-samsung-soc@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Sean Paul , kishon , Ajay Kumar , Jingoo Han , "cpgs ." List-Id: devicetree@vger.kernel.org Hi Inki, On Thu, Oct 30, 2014 at 5:50 PM, Inki Dae wrote: > > Sorry for late. I missed this patch a little bit for long time. Thanks for reviewing. > > > On 2014=EB=85=84 09=EC=9B=94 15=EC=9D=BC 22:13, Vivek Gautam wrote: >> Now that we have moved to generic phy based bindings, >> we don't need to have any code related to older dptx-phy. >> Nobody is using this dptx-phy anymore, so removing the >> same. >> >> Signed-off-by: Vivek Gautam >> Cc: Jingoo Han >> --- >> drivers/gpu/drm/exynos/exynos_dp_core.c | 58 +++++++-------------= ----------- >> drivers/gpu/drm/exynos/exynos_dp_core.h | 2 -- >> 2 files changed, 13 insertions(+), 47 deletions(-) >> >> diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c b/drivers/gpu/d= rm/exynos/exynos_dp_core.c >> index 4f3c7eb..5ffc1b2 100644 >> --- a/drivers/gpu/drm/exynos/exynos_dp_core.c >> +++ b/drivers/gpu/drm/exynos/exynos_dp_core.c >> @@ -1050,28 +1050,14 @@ static int exynos_dp_create_connector(struct= exynos_drm_display *display, >> >> static void exynos_dp_phy_init(struct exynos_dp_device *dp) >> { >> - if (dp->phy) { >> + if (dp->phy) >> phy_power_on(dp->phy); >> - } else if (dp->phy_addr) { >> - u32 reg; >> - >> - reg =3D __raw_readl(dp->phy_addr); >> - reg |=3D dp->enable_mask; >> - __raw_writel(reg, dp->phy_addr); >> - } >> } >> >> static void exynos_dp_phy_exit(struct exynos_dp_device *dp) >> { >> - if (dp->phy) { >> + if (dp->phy) >> phy_power_off(dp->phy); >> - } else if (dp->phy_addr) { >> - u32 reg; >> - >> - reg =3D __raw_readl(dp->phy_addr); >> - reg &=3D ~(dp->enable_mask); >> - __raw_writel(reg, dp->phy_addr); >> - } >> } >> >> static void exynos_dp_poweron(struct exynos_drm_display *display) >> @@ -1210,39 +1196,21 @@ static struct video_info *exynos_dp_dt_parse= _pdata(struct device *dev) >> >> static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp) >> { >> - struct device_node *dp_phy_node =3D of_node_get(dp->dev->of_no= de); >> - u32 phy_base; >> int ret =3D 0; >> >> - dp_phy_node =3D of_find_node_by_name(dp_phy_node, "dptx-phy"); >> - if (!dp_phy_node) { >> - dp->phy =3D devm_phy_get(dp->dev, "dp"); >> - return PTR_ERR_OR_ZERO(dp->phy); >> - } >> - >> - if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) { >> - dev_err(dp->dev, "failed to get reg for dptx-phy\n"); >> - ret =3D -EINVAL; >> - goto err; >> - } >> - >> - if (of_property_read_u32(dp_phy_node, "samsung,enable-mask", >> - &dp->enable_mask)) { >> - dev_err(dp->dev, "failed to get enable-mask for dptx-p= hy\n"); >> - ret =3D -EINVAL; >> - goto err; >> - } >> - >> - dp->phy_addr =3D ioremap(phy_base, SZ_4); >> - if (!dp->phy_addr) { >> - dev_err(dp->dev, "failed to ioremap dp-phy\n"); >> - ret =3D -ENOMEM; >> - goto err; >> + dp->phy =3D devm_phy_get(dp->dev, "dp"); >> + if (IS_ERR(dp->phy)) { >> + ret =3D PTR_ERR(dp->phy); >> + if (ret =3D=3D -ENOSYS || ret =3D=3D -ENODEV) { >> + dp->phy =3D NULL; >> + } else if (ret =3D=3D -EPROBE_DEFER) { >> + return ret; >> + } else { > > WARNING: else is not generally useful after a break or return > #146: FILE: drivers/gpu/drm/exynos/exynos_dp_core.c:1208: > + return ret; > + } else { > > How about just returning ret like below? > if (IS_ERR(dp->phy)) { > dev_err(dp->dev, "no DP phy configured\n"); > return PTR_ERR(ret); > } > > And then you can handle the error at probe function properly. Right, point taken. Will post the reworked patch. [snip] --=20 Best Regards Vivek Gautam Samsung R&D Institute, Bangalore India