Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02d83b5d authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

PNP: make pnp_resource_table private to PNP core 



There are no remaining references to the PNP_MAX_* constants or
the pnp_resource_table structure outside of the PNP core.  Make
them private to the PNP core.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 8766ad0c

drivers/pnp/base.h

+12 −0
Original line number Diff line number Diff line
@@ -20,3 +20,15 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res); 
void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);



void pnp_init_resource(struct resource *res);



#define PNP_MAX_PORT		40

#define PNP_MAX_MEM		24

#define PNP_MAX_IRQ		 2

#define PNP_MAX_DMA		 2



struct pnp_resource_table {

	struct resource port_resource[PNP_MAX_PORT];

	struct resource mem_resource[PNP_MAX_MEM];

	struct resource dma_resource[PNP_MAX_DMA];

	struct resource irq_resource[PNP_MAX_IRQ];

};

drivers/pnp/core.c

+8 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ static void pnp_release_device(struct device *dmdev) 
	pnp_free_option(dev->independent);

	pnp_free_option(dev->dependent);

	pnp_free_ids(dev);

	kfree(dev->res);

	kfree(dev);

}
@@ -118,6 +119,12 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid 
	if (!dev)

		return NULL;



	dev->res = kzalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);

	if (!dev->res) {

		kfree(dev);

		return NULL;

	}



	dev->protocol = protocol;

	dev->number = id;

	dev->dma_mask = DMA_24BIT_MASK;
@@ -133,6 +140,7 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid 


	dev_id = pnp_add_id(dev, pnpid);

	if (!dev_id) {

		kfree(dev->res);

		kfree(dev);

		return NULL;

	}

drivers/pnp/isapnp/core.c

+2 −2
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ EXPORT_SYMBOL(isapnp_write_byte); 


static int isapnp_read_resources(struct pnp_dev *dev)

{

	struct pnp_resource_table *res = &dev->res;

	struct pnp_resource_table *res = dev->res;

	int tmp, ret;



	dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE);
@@ -987,7 +987,7 @@ static int isapnp_get_resources(struct pnp_dev *dev) 


static int isapnp_set_resources(struct pnp_dev *dev)

{

	struct pnp_resource_table *res = &dev->res;

	struct pnp_resource_table *res = dev->res;

	int tmp;



	dev_dbg(&dev->dev, "set resources\n");

drivers/pnp/manager.c

+8 −8
Original line number Diff line number Diff line
@@ -247,22 +247,22 @@ void pnp_init_resources(struct pnp_dev *dev) 
	int idx;



	for (idx = 0; idx < PNP_MAX_IRQ; idx++) {

		res = &dev->res.irq_resource[idx];

		res = &dev->res->irq_resource[idx];

		res->flags = IORESOURCE_IRQ;

		pnp_init_resource(res);

	}

	for (idx = 0; idx < PNP_MAX_DMA; idx++) {

		res = &dev->res.dma_resource[idx];

		res = &dev->res->dma_resource[idx];

		res->flags = IORESOURCE_DMA;

		pnp_init_resource(res);

	}

	for (idx = 0; idx < PNP_MAX_PORT; idx++) {

		res = &dev->res.port_resource[idx];

		res = &dev->res->port_resource[idx];

		res->flags = IORESOURCE_IO;

		pnp_init_resource(res);

	}

	for (idx = 0; idx < PNP_MAX_MEM; idx++) {

		res = &dev->res.mem_resource[idx];

		res = &dev->res->mem_resource[idx];

		res->flags = IORESOURCE_MEM;

		pnp_init_resource(res);

	}
@@ -278,28 +278,28 @@ static void pnp_clean_resource_table(struct pnp_dev *dev) 
	int idx;



	for (idx = 0; idx < PNP_MAX_IRQ; idx++) {

		res = &dev->res.irq_resource[idx];

		res = &dev->res->irq_resource[idx];

		if (res->flags & IORESOURCE_AUTO) {

			res->flags = IORESOURCE_IRQ;

			pnp_init_resource(res);

		}

	}

	for (idx = 0; idx < PNP_MAX_DMA; idx++) {

		res = &dev->res.dma_resource[idx];

		res = &dev->res->dma_resource[idx];

		if (res->flags & IORESOURCE_AUTO) {

			res->flags = IORESOURCE_DMA;

			pnp_init_resource(res);

		}

	}

	for (idx = 0; idx < PNP_MAX_PORT; idx++) {

		res = &dev->res.port_resource[idx];

		res = &dev->res->port_resource[idx];

		if (res->flags & IORESOURCE_AUTO) {

			res->flags = IORESOURCE_IO;

			pnp_init_resource(res);

		}

	}

	for (idx = 0; idx < PNP_MAX_MEM; idx++) {

		res = &dev->res.mem_resource[idx];

		res = &dev->res->mem_resource[idx];

		if (res->flags & IORESOURCE_AUTO) {

			res->flags = IORESOURCE_MEM;

			pnp_init_resource(res);

drivers/pnp/pnpacpi/rsparser.c

+6 −4
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <linux/kernel.h>

#include <linux/acpi.h>

#include <linux/pci.h>

#include <linux/pnp.h>

#include "../base.h"

#include "pnpacpi.h"



#ifdef CONFIG_IA64
@@ -80,7 +82,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev, 
						u32 gsi, int triggering,

						int polarity, int shareable)

{

	struct pnp_resource_table *res = &dev->res;

	struct pnp_resource_table *res = dev->res;

	int i = 0;

	int irq;

	int p, t;
@@ -176,7 +178,7 @@ static int dma_flags(int type, int bus_master, int transfer) 
static void pnpacpi_parse_allocated_dmaresource(struct pnp_dev *dev,

						u32 dma, int flags)

{

	struct pnp_resource_table *res = &dev->res;

	struct pnp_resource_table *res = dev->res;

	int i = 0;

	static unsigned char warned;
@@ -202,7 +204,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_dev *dev, 
static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev,

					       u64 io, u64 len, int io_decode)

{

	struct pnp_resource_table *res = &dev->res;

	struct pnp_resource_table *res = dev->res;

	int i = 0;

	static unsigned char warned;
@@ -230,7 +232,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_dev *dev, 
						u64 mem, u64 len,

						int write_protect)

{

	struct pnp_resource_table *res = &dev->res;

	struct pnp_resource_table *res = dev->res;

	int i = 0;

	static unsigned char warned;