drm: arm/komeda: Remove IRQ parsing from initial series

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.

Reviewed-by: James Qian Wang (Arm Technology China) <[email protected]>
Signed-off-by: Liviu Dudau <[email protected]>

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
index 84fdf707f21079f89fcbf3bde15e88fce43eeab4..0fe6954fbbf4c1da1f818a6746f19a785a1326a7 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
@@ -49,7 +49,6 @@ static int komeda_parse_pipe_dt(struct komeda_dev *mdev, struct device_node *np)
 
 static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
        struct device_node *child, *np = dev->of_node;
        struct clk *clk;
        int ret;
@@ -59,11 +58,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 a0bf7050037a02df43b1a208606c9f3cc5b43742..0f77dead6a2375030e078b07bc7b0711e03975dd 100644 (file)
--- 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 f41b20235130ba9c3d4e3d1bc1f14ee04c40fc53..3fc096d3883e83bc8548d9d15a1e2d91d6f76928 100644 (file)
--- 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: