lkml.org 
[lkml]   [2008]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 08/55] PNP: make pnp_add_card_id() internal to PNP core
    pnp_add_card_id() doesn't need to be exposed outside the PNP core, so
    move the declaration to an internal header file.

    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Acked-By: Rene Herman <rene.herman@gmail.com>

    Index: work10/drivers/pnp/base.h
    ===================================================================
    --- work10.orig/drivers/pnp/base.h 2008-04-28 16:09:12.000000000 -0600
    +++ work10/drivers/pnp/base.h 2008-04-28 16:09:12.000000000 -0600
    @@ -4,6 +4,7 @@
    void pnp_eisa_id_to_string(u32 id, char *str);
    struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);
    struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
    +int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card);
    int pnp_interface_attach_device(struct pnp_dev *dev);
    void pnp_fixup_device(struct pnp_dev *dev);
    void pnp_free_option(struct pnp_option *option);
    Index: work10/include/linux/pnp.h
    ===================================================================
    --- work10.orig/include/linux/pnp.h 2008-04-28 16:09:09.000000000 -0600
    +++ work10/include/linux/pnp.h 2008-04-28 16:09:12.000000000 -0600
    @@ -371,7 +371,6 @@
    void pnp_remove_card(struct pnp_card *card);
    int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
    void pnp_remove_card_device(struct pnp_dev *dev);
    -int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card);
    struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
    const char *id, struct pnp_dev *from);
    void pnp_release_card_device(struct pnp_dev *dev);
    @@ -423,7 +422,6 @@
    static inline void pnp_remove_card(struct pnp_card *card) { }
    static inline int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev) { return -ENODEV; }
    static inline void pnp_remove_card_device(struct pnp_dev *dev) { }
    -static inline int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card) { return -ENODEV; }
    static inline struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, const char *id, struct pnp_dev *from) { return NULL; }
    static inline void pnp_release_card_device(struct pnp_dev *dev) { }
    static inline int pnp_register_card_driver(struct pnp_card_driver *drv) { return -ENODEV; }
    --


    \
     
     \ /
      Last update: 2008-04-29 00:45    [W:7.738 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site