lkml.org 
[lkml]   [2014]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/13] video/mbx: fix building debugfs support
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    The mbx framebuffer debugfs support apparently hasn't been able
    to build for a long time, at least since 2006 when the u.generic_ip
    field in the inode was removed. This fixes the obvious bug, and
    also makes it possible to build the driver as a module when
    debugfs support is enabled, by simply including the C file.
    It's ugly, but it won't make the driver any worse than it
    already is, and doesn't require a more invasive change that
    might break it further.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
    Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
    Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
    Cc: linux-fbdev@vger.kernel.org
    Cc: Raphael Assenat <raph@8d.com>
    Cc: Mike Rapoport <mike@compulab.co.il>
    ---
    drivers/video/fbdev/mbx/Makefile | 3 +--
    drivers/video/fbdev/mbx/mbxdebugfs.c | 2 +-
    drivers/video/fbdev/mbx/mbxfb.c | 2 ++
    3 files changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/video/fbdev/mbx/Makefile b/drivers/video/fbdev/mbx/Makefile
    index 16c1165..d7ae5a9 100644
    --- a/drivers/video/fbdev/mbx/Makefile
    +++ b/drivers/video/fbdev/mbx/Makefile
    @@ -1,4 +1,3 @@
    # Makefile for the 2700G controller driver.

    -obj-$(CONFIG_FB_MBX) += mbxfb.o
    -obj-$(CONFIG_FB_MBX_DEBUG) += mbxfbdebugfs.o
    +obj-y += mbxfb.o
    diff --git a/drivers/video/fbdev/mbx/mbxdebugfs.c b/drivers/video/fbdev/mbx/mbxdebugfs.c
    index 4449f24..e3bc00a 100644
    --- a/drivers/video/fbdev/mbx/mbxdebugfs.c
    +++ b/drivers/video/fbdev/mbx/mbxdebugfs.c
    @@ -17,7 +17,7 @@ struct mbxfb_debugfs_data {

    static int open_file_generic(struct inode *inode, struct file *file)
    {
    - file->private_data = inode->u.generic_ip;
    + file->private_data = inode->i_private;
    return 0;
    }

    diff --git a/drivers/video/fbdev/mbx/mbxfb.c b/drivers/video/fbdev/mbx/mbxfb.c
    index f0a5392..2bd52ed 100644
    --- a/drivers/video/fbdev/mbx/mbxfb.c
    +++ b/drivers/video/fbdev/mbx/mbxfb.c
    @@ -877,6 +877,8 @@ static int mbxfb_resume(struct platform_device *dev)
    #ifndef CONFIG_FB_MBX_DEBUG
    #define mbxfb_debugfs_init(x) do {} while(0)
    #define mbxfb_debugfs_remove(x) do {} while(0)
    +#else
    +#include "mbxdebugfs.c"
    #endif

    #define res_size(_r) (((_r)->end - (_r)->start) + 1)
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2014-04-26 20:41    [W:3.224 / U:0.892 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site