[2.4 patch] pc300_drv.c: mark a function pointer as __devexit_p

From: Adrian Bunk (bunk_at_fs.tum.de)
Date: 01/25/04

  • Next message: Bryan Whitehead: "Re: [PATCH 2.6.2-rc1-mm2] fs/xfs/xfs_log_recover.c" 
    Date:	Sun, 25 Jan 2004 01:55:23 +0100
To: Marcelo Tosatti <marcelo.tosatti@cyclades.com>, pc300@cyclades.com

    I got the following link error in 2.4.25-pre7 when trying to compile
    drivers/net/wan/pc300_drv.c statically into a kernel with
    CONFIG_HOTPLUG=n :

    <-- snip -->

    ...
            -o vmlinux
    local symbol 0: discarded in section `.text.exit' from drivers/net/wan/wan.o
    make: *** [vmlinux] Error 1

    <-- snip -->

    The patch below fixes this issue by marking the function pointer with
    __devexit_p .

    I also did the following changes to this struct:
    - added indentation
    - switched to C99 initializers
    - removed two unneeded NULL's

    Please apply
    Adrian

    --- linux-2.4.25-pre7-full-nohotplug/drivers/net/wan/pc300_drv.c.old 2004-01-25 01:41:56.000000000 +0100
    +++ linux-2.4.25-pre7-full-nohotplug/drivers/net/wan/pc300_drv.c 2004-01-25 01:42:52.000000000 +0100
    @@ -3459,12 +3459,10 @@
     }
     
     static struct pci_driver cpc_driver = {
    - name:"pc300",
    - id_table:cpc_pci_dev_id,
    - probe:cpc_init_one,
    - remove:cpc_remove_one,
    - suspend:NULL,
    - resume:NULL,
    + .name = "pc300",
    + .id_table = cpc_pci_dev_id,
    + .probe = cpc_init_one,
    + .remove = __devexit_p(cpc_remove_one),
     };
     
     static int __init cpc_init(void)
    -
    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/

  • Next message: Bryan Whitehead: "Re: [PATCH 2.6.2-rc1-mm2] fs/xfs/xfs_log_recover.c"

    Relevant Pages