mirror of
https://github.com/torvalds/linux.git
synced 2024-12-06 11:01:43 +00:00
drm/v3d: Delete v3d_dev->pdev
We already have it in v3d_dev->drm.dev with zero additional pointer chasing. Personally I don't like duplicated pointers like this because: - reviewers need to check whether the pointer is for the same or different objects if there's multiple - compilers have an easier time too To avoid having to pull in some big headers I implemented the casting function as a macro instead of a static inline. Typechecking thanks to container_of still assured. But also a bit a bikeshed, so feel free to ignore. v2: More parens for v3d_to_pdev macro (checkpatch) Acked-by: Eric Anholt <eric@anholt.net> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Eric Anholt <eric@anholt.net> Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-11-daniel.vetter@ffwll.ch
This commit is contained in:
parent
bc662528e2
commit
0df3ac7657
@ -235,7 +235,7 @@ static int
|
||||
map_regs(struct v3d_dev *v3d, void __iomem **regs, const char *name)
|
||||
{
|
||||
struct resource *res =
|
||||
platform_get_resource_byname(v3d->pdev, IORESOURCE_MEM, name);
|
||||
platform_get_resource_byname(v3d_to_pdev(v3d), IORESOURCE_MEM, name);
|
||||
|
||||
*regs = devm_ioremap_resource(v3d->drm.dev, res);
|
||||
return PTR_ERR_OR_ZERO(*regs);
|
||||
@ -255,7 +255,6 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(v3d))
|
||||
return PTR_ERR(v3d);
|
||||
|
||||
v3d->pdev = pdev;
|
||||
drm = &v3d->drm;
|
||||
|
||||
platform_set_drvdata(pdev, drm);
|
||||
|
@ -46,7 +46,6 @@ struct v3d_dev {
|
||||
int ver;
|
||||
bool single_irq_line;
|
||||
|
||||
struct platform_device *pdev;
|
||||
void __iomem *hub_regs;
|
||||
void __iomem *core_regs[3];
|
||||
void __iomem *bridge_regs;
|
||||
@ -128,6 +127,8 @@ v3d_has_csd(struct v3d_dev *v3d)
|
||||
return v3d->ver >= 41;
|
||||
}
|
||||
|
||||
#define v3d_to_pdev(v3d) to_platform_device((v3d)->drm.dev)
|
||||
|
||||
/* The per-fd struct, which tracks the MMU mappings. */
|
||||
struct v3d_file_priv {
|
||||
struct v3d_dev *v3d;
|
||||
|
@ -217,7 +217,7 @@ v3d_irq_init(struct v3d_dev *v3d)
|
||||
V3D_CORE_WRITE(core, V3D_CTL_INT_CLR, V3D_CORE_IRQS);
|
||||
V3D_WRITE(V3D_HUB_INT_CLR, V3D_HUB_IRQS);
|
||||
|
||||
irq1 = platform_get_irq(v3d->pdev, 1);
|
||||
irq1 = platform_get_irq(v3d_to_pdev(v3d), 1);
|
||||
if (irq1 == -EPROBE_DEFER)
|
||||
return irq1;
|
||||
if (irq1 > 0) {
|
||||
@ -226,7 +226,8 @@ v3d_irq_init(struct v3d_dev *v3d)
|
||||
"v3d_core0", v3d);
|
||||
if (ret)
|
||||
goto fail;
|
||||
ret = devm_request_irq(v3d->drm.dev, platform_get_irq(v3d->pdev, 0),
|
||||
ret = devm_request_irq(v3d->drm.dev,
|
||||
platform_get_irq(v3d_to_pdev(v3d), 0),
|
||||
v3d_hub_irq, IRQF_SHARED,
|
||||
"v3d_hub", v3d);
|
||||
if (ret)
|
||||
@ -234,7 +235,8 @@ v3d_irq_init(struct v3d_dev *v3d)
|
||||
} else {
|
||||
v3d->single_irq_line = true;
|
||||
|
||||
ret = devm_request_irq(v3d->drm.dev, platform_get_irq(v3d->pdev, 0),
|
||||
ret = devm_request_irq(v3d->drm.dev,
|
||||
platform_get_irq(v3d_to_pdev(v3d), 0),
|
||||
v3d_irq, IRQF_SHARED,
|
||||
"v3d", v3d);
|
||||
if (ret)
|
||||
|
Loading…
Reference in New Issue
Block a user