Skip to content

Commit 2ef0342

Browse files
Christoph Hellwigrafaeljw
authored andcommitted
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>
1 parent 38db63b commit 2ef0342

3 files changed

Lines changed: 0 additions & 33 deletions

File tree

Documentation/admin-guide/pnp.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,6 @@ ISAPNP drivers. They should serve as a temporary solution only.
281281

282282
They are as follows::
283283

284-
struct pnp_card *pnp_find_card(unsigned short vendor,
285-
unsigned short device,
286-
struct pnp_card *from)
287-
288284
struct pnp_dev *pnp_find_dev(struct pnp_card *card,
289285
unsigned short vendor,
290286
unsigned short function,

drivers/pnp/isapnp/compat.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,6 @@ static void pnp_convert_id(char *buf, unsigned short vendor,
2121
(device >> 12) & 0x0f, (device >> 8) & 0x0f);
2222
}
2323

24-
struct pnp_card *pnp_find_card(unsigned short vendor, unsigned short device,
25-
struct pnp_card *from)
26-
{
27-
char id[8];
28-
char any[8];
29-
struct list_head *list;
30-
31-
pnp_convert_id(id, vendor, device);
32-
pnp_convert_id(any, ISAPNP_ANY_ID, ISAPNP_ANY_ID);
33-
34-
list = from ? from->global_list.next : pnp_cards.next;
35-
36-
while (list != &pnp_cards) {
37-
struct pnp_card *card = global_to_pnp_card(list);
38-
39-
if (compare_pnp_id(card->id, id) || (memcmp(id, any, 7) == 0))
40-
return card;
41-
list = list->next;
42-
}
43-
return NULL;
44-
}
45-
4624
struct pnp_dev *pnp_find_dev(struct pnp_card *card, unsigned short vendor,
4725
unsigned short function, struct pnp_dev *from)
4826
{
@@ -86,5 +64,4 @@ struct pnp_dev *pnp_find_dev(struct pnp_card *card, unsigned short vendor,
8664
return NULL;
8765
}
8866

89-
EXPORT_SYMBOL(pnp_find_card);
9067
EXPORT_SYMBOL(pnp_find_dev);

include/linux/isapnp.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ static inline int isapnp_proc_done(void) { return 0; }
7575
#endif
7676

7777
/* compat */
78-
struct pnp_card *pnp_find_card(unsigned short vendor,
79-
unsigned short device,
80-
struct pnp_card *from);
8178
struct pnp_dev *pnp_find_dev(struct pnp_card *card,
8279
unsigned short vendor,
8380
unsigned short function,
@@ -92,9 +89,6 @@ static inline int isapnp_cfg_end(void) { return -ENODEV; }
9289
static inline unsigned char isapnp_read_byte(unsigned char idx) { return 0xff; }
9390
static inline void isapnp_write_byte(unsigned char idx, unsigned char val) { ; }
9491

95-
static inline struct pnp_card *pnp_find_card(unsigned short vendor,
96-
unsigned short device,
97-
struct pnp_card *from) { return NULL; }
9892
static inline struct pnp_dev *pnp_find_dev(struct pnp_card *card,
9993
unsigned short vendor,
10094
unsigned short function,

0 commit comments

Comments
 (0)