Commit defb53a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pnp-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull PNP updates from Rafael Wysocki:
 "These clean the PNP code somewhat:

   - Remove the now unused pnp_find_card() function (Christoph Hellwig)

   - Drop duplicate pci.h include from the quirks code and add an
     "internal.h" include to acpi_pnp.c to fix a compiler warning (Tian
     Tao)"

* tag 'pnp-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: remove the now unused pnp_find_card() function
  PNP: ACPI: Fix missing-prototypes in acpi_pnp.c
  PNP: quirks: Fix duplicate included pci.h
parents cf1d2b44 2ef03425

Documentation/admin-guide/pnp.rst

+0 −4
Original line number Diff line number Diff line
@@ -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/acpi/acpi_pnp.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/module.h>

#include <linux/ctype.h>



#include "internal.h"



static const struct acpi_device_id acpi_pnp_device_ids[] = {

	/* pata_isapnp */

	{"PNP0600"},		/* Generic ESDI/IDE/ATA compatible hard disk controller */

drivers/pnp/isapnp/compat.c

+0 −23
Original line number Diff line number Diff line
@@ -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);

drivers/pnp/quirks.c

+0 −2
Original line number Diff line number Diff line
@@ -226,8 +226,6 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *dev) 
	dev_info(&dev->dev, "made independent IRQ optional\n");

}



#include <linux/pci.h>



static void quirk_system_pci_resources(struct pnp_dev *dev)

{

	struct pci_dev *pdev = NULL;

include/linux/isapnp.h

+0 −6
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE