lkml.org 
[lkml]   [2010]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[056/200] fbdev: section cleanup in hgafb
    2.6.34-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Henrik Kretzschmar <henne@nachtwindheim.de>

    commit e217e6e39f62e47f7e659b715235dbd57df480f8 upstream.

    Fix up the sections in the hgafb driver, by

    * moving hga_default_var and hga_fix from .init.data to .devinit.data

    * moving hga_detect() from .init.text to .devinit.text

    * moving hga_fb_remove() from .text to .devexit.text

    This fixes the following warnings issued by modpost:

    WARNING: drivers/video/hgafb.o(.devinit.text+0x18): Section mismatch in referenc
    e from the function hgafb_probe() to the function .init.text:hga_card_detect()
    The function __devinit hgafb_probe() references
    a function __init hga_card_detect().
    If hga_card_detect is only used by hgafb_probe then
    annotate hga_card_detect with a matching annotation.

    WARNING: drivers/video/hgafb.o(.devinit.text+0xfe): Section mismatch in referenc
    e from the function hgafb_probe() to the variable .init.data:hga_fix
    The function __devinit hgafb_probe() references
    a variable __initdata hga_fix.
    If hga_fix is only used by hgafb_probe then
    annotate hga_fix with a matching annotation.

    WARNING: drivers/video/hgafb.o(.devinit.text+0x105): Section mismatch in reference from the function hgafb_probe() to the variable .init.data:hga_default_var
    The function __devinit hgafb_probe() references
    a variable __initdata hga_default_var.
    If hga_default_var is only used by hgafb_probe then
    annotate hga_default_var with a matching annotation.

    Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/video/hgafb.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/drivers/video/hgafb.c
    +++ b/drivers/video/hgafb.c
    @@ -106,7 +106,7 @@ static DEFINE_SPINLOCK(hga_reg_lock);

    /* Framebuffer driver structures */

    -static struct fb_var_screeninfo __initdata hga_default_var = {
    +static struct fb_var_screeninfo hga_default_var __devinitdata = {
    .xres = 720,
    .yres = 348,
    .xres_virtual = 720,
    @@ -120,7 +120,7 @@ static struct fb_var_screeninfo __initda
    .width = -1,
    };

    -static struct fb_fix_screeninfo __initdata hga_fix = {
    +static struct fb_fix_screeninfo hga_fix __devinitdata = {
    .id = "HGA",
    .type = FB_TYPE_PACKED_PIXELS, /* (not sure) */
    .visual = FB_VISUAL_MONO10,
    @@ -276,7 +276,7 @@ static void hga_blank(int blank_mode)
    spin_unlock_irqrestore(&hga_reg_lock, flags);
    }

    -static int __init hga_card_detect(void)
    +static int __devinit hga_card_detect(void)
    {
    int count = 0;
    void __iomem *p, *q;
    @@ -596,7 +596,7 @@ static int __devinit hgafb_probe(struct
    return 0;
    }

    -static int hgafb_remove(struct platform_device *pdev)
    +static int __devexit hgafb_remove(struct platform_device *pdev)
    {
    struct fb_info *info = platform_get_drvdata(pdev);

    @@ -621,7 +621,7 @@ static int hgafb_remove(struct platform_

    static struct platform_driver hgafb_driver = {
    .probe = hgafb_probe,
    - .remove = hgafb_remove,
    + .remove = __devexit_p(hgafb_remove),
    .driver = {
    .name = "hgafb",
    },

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-07-01 23:35    [from the cache]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site