pnp: remove the now unused pnp_find_card function
Subsystems (4)
PATCH 1/1 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 <[email protected]>
--- Documentation/admin-guide/pnp.rst | 4 ---- drivers/pnp/isapnp/compat.c | 23 ----------------------- include/linux/isapnp.h | 6 ------ 3 files changed, 33 deletions(-)
Documentation/admin-guide/pnp.rst +0 -4
@@ -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,
drivers/pnp/isapnp/compat.c +0 -23
@@ -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);
include/linux/isapnp.h +0 -6
@@ -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,
Signature · 1 line
2.28.0
Quoted 80 lines · Christoph Hellwig
All user of the
pnp_find_cardcompat wrapper are gone, so remove the function as well.Signed-off-by Christoph Hellwig <[email protected]>--- Documentation/admin-guide/pnp.rst | 4 ---- drivers/pnp/isapnp/compat.c | 23 ----------------------- include/linux/isapnp.h | 6 ------ 3 files changed, 33 deletions(-)Documentation/admin-guide/pnp.rst +0
-4@@ -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,drivers/pnp/isapnp/compat.c +0
-23@@ -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);include/linux/isapnp.h +0
-3@@ -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,
include/linux/isapnp.h static inline int isapnp_cfg_end(void) { return -ENODEV; }
Quoted 10 lines
include/linux/isapnp.h +0
-4@@ -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, --
Applied as 5.10 material, thanks!