Skip to content

Commit c7963f5

Browse files
pinchartltomba
pinchartl
authored and
tomba
committed
drm: omapdrm: dsi: Use dev pointer directly in dsi_bind() function
The dsi_bind() function receives a pointer to a struct device that it casts to a struct platform_device, only to use the platform device's dev field through the code. Use the dev pointer directly. While at it rename the struct platform_device pointer dsidev to pdev to make it more explicit. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
1 parent c068408 commit c7963f5

File tree

1 file changed

+18
-17
lines changed
  • drivers/gpu/drm/omapdrm/dss

1 file changed

+18
-17
lines changed

‎drivers/gpu/drm/omapdrm/dss/dsi.c

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5299,9 +5299,10 @@ static const struct soc_device_attribute dsi_soc_devices[] = {
52995299
{ .machine = "AM35*", .data = &dsi_of_data_omap34xx },
53005300
{ /* sentinel */ }
53015301
};
5302+
53025303
static int dsi_bind(struct device *dev, struct device *master, void *data)
53035304
{
5304-
struct platform_device *dsidev = to_platform_device(dev);
5305+
struct platform_device *pdev = to_platform_device(dev);
53055306
struct dss_device *dss = dss_get_device(master);
53065307
const struct soc_device_attribute *soc;
53075308
const struct dsi_module_id_data *d;
@@ -5311,13 +5312,13 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
53115312
struct resource *dsi_mem;
53125313
struct resource *res;
53135314

5314-
dsi = devm_kzalloc(&dsidev->dev, sizeof(*dsi), GFP_KERNEL);
5315+
dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL);
53155316
if (!dsi)
53165317
return -ENOMEM;
53175318

53185319
dsi->dss = dss;
5319-
dsi->pdev = dsidev;
5320-
dev_set_drvdata(&dsidev->dev, dsi);
5320+
dsi->pdev = pdev;
5321+
dev_set_drvdata(dev, dsi);
53215322

53225323
spin_lock_init(&dsi->irq_lock);
53235324
spin_lock_init(&dsi->errors_lock);
@@ -5338,29 +5339,29 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
53385339
timer_setup(&dsi->te_timer, dsi_te_timeout, 0);
53395340
#endif
53405341

5341-
dsi_mem = platform_get_resource_byname(dsidev, IORESOURCE_MEM, "proto");
5342-
dsi->proto_base = devm_ioremap_resource(&dsidev->dev, dsi_mem);
5342+
dsi_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "proto");
5343+
dsi->proto_base = devm_ioremap_resource(dev, dsi_mem);
53435344
if (IS_ERR(dsi->proto_base))
53445345
return PTR_ERR(dsi->proto_base);
53455346

5346-
res = platform_get_resource_byname(dsidev, IORESOURCE_MEM, "phy");
5347-
dsi->phy_base = devm_ioremap_resource(&dsidev->dev, res);
5347+
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
5348+
dsi->phy_base = devm_ioremap_resource(dev, res);
53485349
if (IS_ERR(dsi->phy_base))
53495350
return PTR_ERR(dsi->phy_base);
53505351

5351-
res = platform_get_resource_byname(dsidev, IORESOURCE_MEM, "pll");
5352-
dsi->pll_base = devm_ioremap_resource(&dsidev->dev, res);
5352+
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll");
5353+
dsi->pll_base = devm_ioremap_resource(dev, res);
53535354
if (IS_ERR(dsi->pll_base))
53545355
return PTR_ERR(dsi->pll_base);
53555356

5356-
dsi->irq = platform_get_irq(dsi->pdev, 0);
5357+
dsi->irq = platform_get_irq(pdev, 0);
53575358
if (dsi->irq < 0) {
53585359
DSSERR("platform_get_irq failed\n");
53595360
return -ENODEV;
53605361
}
53615362

5362-
r = devm_request_irq(&dsidev->dev, dsi->irq, omap_dsi_irq_handler,
5363-
IRQF_SHARED, dev_name(&dsidev->dev), dsi);
5363+
r = devm_request_irq(dev, dsi->irq, omap_dsi_irq_handler,
5364+
IRQF_SHARED, dev_name(dev), dsi);
53645365
if (r < 0) {
53655366
DSSERR("request_irq failed\n");
53665367
return r;
@@ -5414,14 +5415,14 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
54145415

54155416
dsi_init_pll_data(dss, dsi);
54165417

5417-
pm_runtime_enable(&dsidev->dev);
5418+
pm_runtime_enable(dev);
54185419

54195420
r = dsi_runtime_get(dsi);
54205421
if (r)
54215422
goto err_runtime_get;
54225423

54235424
rev = dsi_read_reg(dsi, DSI_REVISION);
5424-
dev_dbg(&dsidev->dev, "OMAP DSI rev %d.%d\n",
5425+
dev_dbg(dev, "OMAP DSI rev %d.%d\n",
54255426
FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
54265427

54275428
/* DSI on OMAP3 doesn't have register DSI_GNQ, set number
@@ -5442,7 +5443,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
54425443
goto err_probe_of;
54435444
}
54445445

5445-
r = of_platform_populate(dsidev->dev.of_node, NULL, NULL, &dsidev->dev);
5446+
r = of_platform_populate(dev->of_node, NULL, NULL, dev);
54465447
if (r)
54475448
DSSERR("Failed to populate DSI child devices: %d\n", r);
54485449

@@ -5474,7 +5475,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
54745475
dsi_runtime_put(dsi);
54755476

54765477
err_runtime_get:
5477-
pm_runtime_disable(&dsidev->dev);
5478+
pm_runtime_disable(dev);
54785479
return r;
54795480
}
54805481

0 commit comments

Comments
 (0)