sh_mobile_hdmi: Remove platform data lcd_dev field

The field is used to print debug messages only. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index eeb4d96645845dbaa974e138d6903ce331329cb9..adab85de84769dd69d364a524f30ddf7aa448d3f 100644 (file)
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -856,7 +856,6 @@ static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,
 
 static struct sh_mobile_hdmi_info hdmi_info = {
        .lcd_chan = &sh_mobile_lcdc1_info.ch[0],
-       .lcd_dev = &lcdc1_device.dev,
        .flags = HDMI_SND_SRC_SPDIF,
        .clk_optimize_parent = ap4evb_clk_optimize,
 };

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index a2813247b4558d540682c391c0ca07e5ffbc261b..1e02293901976bb32269e7db0ed620e9b8caa5b2 100644 (file)
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -480,7 +480,6 @@ static struct platform_device hdmi_lcdc_device = {
 
 static struct sh_mobile_hdmi_info hdmi_info = {
        .lcd_chan       = &hdmi_lcdc_info.ch[0],
-       .lcd_dev        = &hdmi_lcdc_device.dev,
        .flags          = HDMI_SND_SRC_SPDIF,
 };
 

diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index a77bbc3e9e13e08e2bb3d7f1941e5cb6977e450f..ebd06515f033cd299f73e116ffbcb13619b63235 100644 (file)
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -1008,11 +1008,9 @@ static void sh_hdmi_display_on(void *arg, struct fb_info *info)
         * FB_EVENT_FB_UNBIND notify is also called with info->lock held
         */
        struct sh_hdmi *hdmi = arg;
-       struct sh_mobile_hdmi_info *pdata = hdmi->dev->platform_data;
        struct sh_mobile_lcdc_chan *ch = info->par;
 
-       dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__,
-               pdata->lcd_dev, info->state);
+       dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__, hdmi, info->state);
 
        /* No need to lock */
        hdmi->info = info;
@@ -1040,9 +1038,8 @@ static void sh_hdmi_display_on(void *arg, struct fb_info *info)
 static void sh_hdmi_display_off(void *arg)
 {
        struct sh_hdmi *hdmi = arg;
-       struct sh_mobile_hdmi_info *pdata = hdmi->dev->platform_data;
 
-       dev_dbg(hdmi->dev, "%s(%p)\n", __func__, pdata->lcd_dev);
+       dev_dbg(hdmi->dev, "%s(%p)\n", __func__, hdmi);
        /* PS mode e->a */
        hdmi_write(hdmi, 0x10, HDMI_SYSTEM_CTRL);
 }
@@ -1114,15 +1111,11 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
 {
        struct sh_hdmi *hdmi = container_of(work, struct sh_hdmi, edid_work.work);
        struct fb_info *info;
-       struct sh_mobile_hdmi_info *pdata = hdmi->dev->platform_data;
        struct sh_mobile_lcdc_chan *ch;
        int ret;
 
-       dev_dbg(hdmi->dev, "%s(%p): begin, hotplug status %d\n", __func__,
-               pdata->lcd_dev, hdmi->hp_state);
-
-       if (!pdata->lcd_dev)
-               return;
+       dev_dbg(hdmi->dev, "%s(%p): begin, hotplug status %d\n", __func__, hdmi,
+               hdmi->hp_state);
 
        mutex_lock(&hdmi->mutex);
 
@@ -1198,7 +1191,7 @@ out:
                hdmi->hp_state = HDMI_HOTPLUG_DISCONNECTED;
        mutex_unlock(&hdmi->mutex);
 
-       dev_dbg(hdmi->dev, "%s(%p): end\n", __func__, pdata->lcd_dev);
+       dev_dbg(hdmi->dev, "%s(%p): end\n", __func__, hdmi);
 }
 
 static int sh_hdmi_notify(struct notifier_block *nb,

diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h
index b56932927d0a5e9ae92f7d43f8dd67c00c5991de..0b8d2cf0d5103f336af3bd54fea4a432a8a3efa2 100644 (file)
--- a/include/video/sh_mobile_hdmi.h
+++ b/include/video/sh_mobile_hdmi.h
@@ -32,7 +32,6 @@ struct clk;
 
 struct sh_mobile_hdmi_info {
        struct sh_mobile_lcdc_chan_cfg  *lcd_chan;
-       struct device                   *lcd_dev;
        unsigned int                     flags;
        long (*clk_optimize_parent)(unsigned long target, unsigned long *best_freq,
                                    unsigned long *parent_freq);