| Message ID | 20190115101544.8653-1-Liviu.Dudau@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | drm: arm/komeda: Remove IRQ parsing from initial series | expand |
On Tue, Jan 15, 2019 at 10:15:44AM +0000, Liviu Dudau wrote: > The initial series is only introducing the basic components and not > implementing IRQ handling. Remove the left over code that touches > IRQs until the proper implementation is introduced in a later series. > > Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> > --- > drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 5 ----- > drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 3 --- > drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 4 +--- > 3 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > index 84fdf707f2107..16f4e72abc1a3 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > @@ -59,11 +59,6 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev) > return PTR_ERR(clk); > > mdev->mclk = clk; > -mdev->irq = platform_get_irq(pdev, 0); > -if (mdev->irq < 0) { > -DRM_ERROR("could not get IRQ number.\n"); > -return mdev->irq; > -} > > for_each_available_child_of_node(np, child) { > if (of_node_cmp(child->name, "pipeline") == 0) { > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h > index a0bf7050037a0..0f77dead6a237 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h > @@ -81,9 +81,6 @@ struct komeda_dev { > /** @mck: HW main engine clk */ > struct clk *mclk; > > -/** @irq: irq number */ > -u32 irq; > - > int n_pipelines; > struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES]; > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c > index f41b20235130b..3fc096d3883e8 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c > @@ -142,12 +142,10 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) > > err = drm_dev_register(drm, 0); > if (err) > -goto uninstall_irq; > +goto cleanup_mode_config; > > return kms; > > -uninstall_irq: > -drm_irq_uninstall(drm); > cleanup_mode_config: > drm_mode_config_cleanup(drm); > free_kms: IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
On Tue, Jan 15, 2019 at 10:15:44AM +0000, Liviu Dudau wrote: > The initial series is only introducing the basic components and not > implementing IRQ handling. Remove the left over code that touches > IRQs until the proper implementation is introduced in a later series. > > Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> > --- > drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 5 ----- > drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 3 --- > drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 4 +--- > 3 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > index 84fdf707f2107..16f4e72abc1a3 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > @@ -59,11 +59,6 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev) > return PTR_ERR(clk); > > mdev->mclk = clk; > - mdev->irq = platform_get_irq(pdev, 0); > - if (mdev->irq < 0) { > - DRM_ERROR("could not get IRQ number.\n"); > - return mdev->irq; > - } > > for_each_available_child_of_node(np, child) { > if (of_node_cmp(child->name, "pipeline") == 0) { > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h > index a0bf7050037a0..0f77dead6a237 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h > @@ -81,9 +81,6 @@ struct komeda_dev { > /** @mck: HW main engine clk */ > struct clk *mclk; > > - /** @irq: irq number */ > - u32 irq; > - > int n_pipelines; > struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES]; > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c > index f41b20235130b..3fc096d3883e8 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c > @@ -142,12 +142,10 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) > > err = drm_dev_register(drm, 0); > if (err) > - goto uninstall_irq; > + goto cleanup_mode_config; > > return kms; > > -uninstall_irq: > - drm_irq_uninstall(drm); > cleanup_mode_config: > drm_mode_config_cleanup(drm); > free_kms:
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c index 84fdf707f2107..16f4e72abc1a3 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c @@ -59,11 +59,6 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev) return PTR_ERR(clk); mdev->mclk = clk; - mdev->irq = platform_get_irq(pdev, 0); - if (mdev->irq < 0) { - DRM_ERROR("could not get IRQ number.\n"); - return mdev->irq; - } for_each_available_child_of_node(np, child) { if (of_node_cmp(child->name, "pipeline") == 0) { diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h index a0bf7050037a0..0f77dead6a237 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h @@ -81,9 +81,6 @@ struct komeda_dev { /** @mck: HW main engine clk */ struct clk *mclk; - /** @irq: irq number */ - u32 irq; - int n_pipelines; struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES]; diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c index f41b20235130b..3fc096d3883e8 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c @@ -142,12 +142,10 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) err = drm_dev_register(drm, 0); if (err) - goto uninstall_irq; + goto cleanup_mode_config; return kms; -uninstall_irq: - drm_irq_uninstall(drm); cleanup_mode_config: drm_mode_config_cleanup(drm); free_kms:
The initial series is only introducing the basic components and not implementing IRQ handling. Remove the left over code that touches IRQs until the proper implementation is introduced in a later series. Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> --- drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 5 ----- drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 3 --- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 4 +--- 3 files changed, 1 insertion(+), 11 deletions(-)