mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 16:15:11 +00:00
Code Issues Releases Wiki Activity

drm/msm/dp: Refactor ioremap wrapper

Browse source 
In order to deal with multiple memory ranges in the following commit
change the ioremap wrapper to not poke directly into the dss_io_data
struct.

While at it, devm_ioremap_resource() already prints useful error
messages on failure, so omit the unnecessary prints from the caller.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20211001174400.981707-4-bjorn.andersson@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
This commit is contained in:
Bjorn Andersson 2021-10-01 10:43:58 -07:00 committed by Rob Clark
parent 17b019e3b0
commit ef501dbf84
2 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/gpu/drm/msm/dp/dp_parser.c
View file

@ -19,40 +19,27 @@ static const struct dp_regulator_cfg sdm845_dp_reg_cfg = {
},
};
static int msm_dss_ioremap(struct platform_device *pdev,
struct dss_io_data *io_data)
static void __iomem *dp_ioremap(struct platform_device *pdev, int idx, size_t *len)
{
struct resource *res = NULL;
struct resource *res;
void __iomem *base;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
DRM_ERROR("%pS->%s: msm_dss_get_res failed\n",
__builtin_return_address(0), __func__);
return -ENODEV;
}
base = devm_platform_get_and_ioremap_resource(pdev, idx, &res);
if (!IS_ERR(base))
*len = resource_size(res);
io_data->len = (u32)resource_size(res);
io_data->base = devm_ioremap(&pdev->dev, res->start, io_data->len);
if (!io_data->base) {
DRM_ERROR("%pS->%s: ioremap failed\n",
__builtin_return_address(0), __func__);
return -EIO;
}
return 0;
return base;
}
static int dp_parser_ctrl_res(struct dp_parser *parser)
{
int rc = 0;
struct platform_device *pdev = parser->pdev;
struct dp_io *io = &parser->io;
struct dss_io_data *dss = &io->dp_controller;
rc = msm_dss_ioremap(pdev, &io->dp_controller);
if (rc) {
DRM_ERROR("unable to remap dp io resources, rc=%d\n", rc);
return rc;
}
dss->base = dp_ioremap(pdev, 0, &dss->len);
if (IS_ERR(dss->base))
return PTR_ERR(dss->base);
io->phy = devm_phy_get(&pdev->dev, "dp");
if (IS_ERR(io->phy))

2
drivers/gpu/drm/msm/dp/dp_parser.h
View file

@ -26,7 +26,7 @@ enum dp_pm_type {
};
struct dss_io_data {
u32 len;
size_t len;
void __iomem *base;
};