PNP: remove the now unused pnp_find_card() function

All user of the pnp_find_card() compat wrapper are gone, so remove
the function as well.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/Documentation/admin-guide/pnp.rst b/Documentation/admin-guide/pnp.rst
index bab2d10631f00dd88d702a5d836d7b637ffbacb4..3eda08191d139a9690243b84803b40c3aa52eb81 100644 (file)
--- a/Documentation/admin-guide/pnp.rst
+++ b/Documentation/admin-guide/pnp.rst
@@ -281,10 +281,6 @@ ISAPNP drivers.  They should serve as a temporary solution only.
 
 They are as follows::
 
-       struct pnp_card *pnp_find_card(unsigned short vendor,
-                                      unsigned short device,
-                                      struct pnp_card *from)
-
        struct pnp_dev *pnp_find_dev(struct pnp_card *card,
                                     unsigned short vendor,
                                     unsigned short function,

diff --git a/drivers/pnp/isapnp/compat.c b/drivers/pnp/isapnp/compat.c
index 6c845b6283163da47ecf339eb73c3c06b5d8d736..035e9509248968bcadaf24fc86b235258c6d6e9f 100644 (file)
--- a/drivers/pnp/isapnp/compat.c
+++ b/drivers/pnp/isapnp/compat.c
@@ -21,28 +21,6 @@ static void pnp_convert_id(char *buf, unsigned short vendor,
                (device >> 12) & 0x0f, (device >> 8) & 0x0f);
 }
 
-struct pnp_card *pnp_find_card(unsigned short vendor, unsigned short device,
-                              struct pnp_card *from)
-{
-       char id[8];
-       char any[8];
-       struct list_head *list;
-
-       pnp_convert_id(id, vendor, device);
-       pnp_convert_id(any, ISAPNP_ANY_ID, ISAPNP_ANY_ID);
-
-       list = from ? from->global_list.next : pnp_cards.next;
-
-       while (list != &pnp_cards) {
-               struct pnp_card *card = global_to_pnp_card(list);
-
-               if (compare_pnp_id(card->id, id) || (memcmp(id, any, 7) == 0))
-                       return card;
-               list = list->next;
-       }
-       return NULL;
-}
-
 struct pnp_dev *pnp_find_dev(struct pnp_card *card, unsigned short vendor,
                             unsigned short function, struct pnp_dev *from)
 {
@@ -86,5 +64,4 @@ struct pnp_dev *pnp_find_dev(struct pnp_card *card, unsigned short vendor,
        return NULL;
 }
 
-EXPORT_SYMBOL(pnp_find_card);
 EXPORT_SYMBOL(pnp_find_dev);

diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h
index 11edb2109a68f63a0862837c17577b838ab54843..dba18c95844bde76ec7985ae7568046b78bb5c2f 100644 (file)
--- a/include/linux/isapnp.h
+++ b/include/linux/isapnp.h
@@ -75,9 +75,6 @@ static inline int isapnp_proc_done(void) { return 0; }
 #endif
 
 /* compat */
-struct pnp_card *pnp_find_card(unsigned short vendor,
-                              unsigned short device,
-                              struct pnp_card *from);
 struct pnp_dev *pnp_find_dev(struct pnp_card *card,
                             unsigned short vendor,
                             unsigned short function,
@@ -92,9 +89,6 @@ static inline int isapnp_cfg_end(void) { return -ENODEV; }
 static inline unsigned char isapnp_read_byte(unsigned char idx) { return 0xff; }
 static inline void isapnp_write_byte(unsigned char idx, unsigned char val) { ; }
 
-static inline struct pnp_card *pnp_find_card(unsigned short vendor,
-                                            unsigned short device,
-                                            struct pnp_card *from) { return NULL; }
 static inline struct pnp_dev *pnp_find_dev(struct pnp_card *card,
                                           unsigned short vendor,
                                           unsigned short function,