PNP: convert resource accessors to use pnp_get_resource(), not pnp_resource_table
This removes more direct references to pnp_resource_table. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas
Len Brown
parent
53052feb6d
commit
13575e81bb
|
|
@ -27,46 +27,111 @@ struct pnp_dev;
|
|||
*/
|
||||
struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int);
|
||||
|
||||
/* Use these instead of directly reading pnp_dev to get resource information */
|
||||
#define pnp_port_start(dev,bar) ((dev)->res.port_resource[(bar)].start)
|
||||
#define pnp_port_end(dev,bar) ((dev)->res.port_resource[(bar)].end)
|
||||
#define pnp_port_flags(dev,bar) ((dev)->res.port_resource[(bar)].flags)
|
||||
#define pnp_port_valid(dev,bar) \
|
||||
((pnp_port_flags((dev),(bar)) & (IORESOURCE_IO | IORESOURCE_UNSET)) \
|
||||
== IORESOURCE_IO)
|
||||
#define pnp_port_len(dev,bar) \
|
||||
((pnp_port_start((dev),(bar)) == 0 && \
|
||||
pnp_port_end((dev),(bar)) == \
|
||||
pnp_port_start((dev),(bar))) ? 0 : \
|
||||
\
|
||||
(pnp_port_end((dev),(bar)) - \
|
||||
pnp_port_start((dev),(bar)) + 1))
|
||||
static inline int pnp_resource_valid(struct resource *res)
|
||||
{
|
||||
if (res && !(res->flags & IORESOURCE_UNSET))
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define pnp_mem_start(dev,bar) ((dev)->res.mem_resource[(bar)].start)
|
||||
#define pnp_mem_end(dev,bar) ((dev)->res.mem_resource[(bar)].end)
|
||||
#define pnp_mem_flags(dev,bar) ((dev)->res.mem_resource[(bar)].flags)
|
||||
#define pnp_mem_valid(dev,bar) \
|
||||
((pnp_mem_flags((dev),(bar)) & (IORESOURCE_MEM | IORESOURCE_UNSET)) \
|
||||
== IORESOURCE_MEM)
|
||||
#define pnp_mem_len(dev,bar) \
|
||||
((pnp_mem_start((dev),(bar)) == 0 && \
|
||||
pnp_mem_end((dev),(bar)) == \
|
||||
pnp_mem_start((dev),(bar))) ? 0 : \
|
||||
\
|
||||
(pnp_mem_end((dev),(bar)) - \
|
||||
pnp_mem_start((dev),(bar)) + 1))
|
||||
static inline resource_size_t pnp_resource_len(struct resource *res)
|
||||
{
|
||||
if (res->start == 0 && res->end == 0)
|
||||
return 0;
|
||||
return res->end - res->start + 1;
|
||||
}
|
||||
|
||||
#define pnp_irq(dev,bar) ((dev)->res.irq_resource[(bar)].start)
|
||||
#define pnp_irq_flags(dev,bar) ((dev)->res.irq_resource[(bar)].flags)
|
||||
#define pnp_irq_valid(dev,bar) \
|
||||
((pnp_irq_flags((dev),(bar)) & (IORESOURCE_IRQ | IORESOURCE_UNSET)) \
|
||||
== IORESOURCE_IRQ)
|
||||
|
||||
#define pnp_dma(dev,bar) ((dev)->res.dma_resource[(bar)].start)
|
||||
#define pnp_dma_flags(dev,bar) ((dev)->res.dma_resource[(bar)].flags)
|
||||
#define pnp_dma_valid(dev,bar) \
|
||||
((pnp_dma_flags((dev),(bar)) & (IORESOURCE_DMA | IORESOURCE_UNSET)) \
|
||||
== IORESOURCE_DMA)
|
||||
static inline resource_size_t pnp_port_start(struct pnp_dev *dev,
|
||||
unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_IO, bar)->start;
|
||||
}
|
||||
|
||||
static inline resource_size_t pnp_port_end(struct pnp_dev *dev,
|
||||
unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_IO, bar)->end;
|
||||
}
|
||||
|
||||
static inline unsigned long pnp_port_flags(struct pnp_dev *dev,
|
||||
unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_IO, bar)->flags;
|
||||
}
|
||||
|
||||
static inline int pnp_port_valid(struct pnp_dev *dev, unsigned int bar)
|
||||
{
|
||||
return pnp_resource_valid(pnp_get_resource(dev, IORESOURCE_IO, bar));
|
||||
}
|
||||
|
||||
static inline resource_size_t pnp_port_len(struct pnp_dev *dev,
|
||||
unsigned int bar)
|
||||
{
|
||||
return pnp_resource_len(pnp_get_resource(dev, IORESOURCE_IO, bar));
|
||||
}
|
||||
|
||||
|
||||
static inline resource_size_t pnp_mem_start(struct pnp_dev *dev,
|
||||
unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_MEM, bar)->start;
|
||||
}
|
||||
|
||||
static inline resource_size_t pnp_mem_end(struct pnp_dev *dev,
|
||||
unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_MEM, bar)->end;
|
||||
}
|
||||
|
||||
static inline unsigned long pnp_mem_flags(struct pnp_dev *dev, unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_MEM, bar)->flags;
|
||||
}
|
||||
|
||||
static inline int pnp_mem_valid(struct pnp_dev *dev, unsigned int bar)
|
||||
{
|
||||
return pnp_resource_valid(pnp_get_resource(dev, IORESOURCE_MEM, bar));
|
||||
}
|
||||
|
||||
static inline resource_size_t pnp_mem_len(struct pnp_dev *dev,
|
||||
unsigned int bar)
|
||||
{
|
||||
return pnp_resource_len(pnp_get_resource(dev, IORESOURCE_MEM, bar));
|
||||
}
|
||||
|
||||
|
||||
static inline resource_size_t pnp_irq(struct pnp_dev *dev, unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_IRQ, bar)->start;
|
||||
}
|
||||
|
||||
static inline unsigned long pnp_irq_flags(struct pnp_dev *dev, unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_IRQ, bar)->flags;
|
||||
}
|
||||
|
||||
static inline int pnp_irq_valid(struct pnp_dev *dev, unsigned int bar)
|
||||
{
|
||||
return pnp_resource_valid(pnp_get_resource(dev, IORESOURCE_IRQ, bar));
|
||||
}
|
||||
|
||||
|
||||
static inline resource_size_t pnp_dma(struct pnp_dev *dev, unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_DMA, bar)->start;
|
||||
}
|
||||
|
||||
static inline unsigned long pnp_dma_flags(struct pnp_dev *dev, unsigned int bar)
|
||||
{
|
||||
return pnp_get_resource(dev, IORESOURCE_DMA, bar)->flags;
|
||||
}
|
||||
|
||||
static inline int pnp_dma_valid(struct pnp_dev *dev, unsigned int bar)
|
||||
{
|
||||
return pnp_resource_valid(pnp_get_resource(dev, IORESOURCE_DMA, bar));
|
||||
}
|
||||
|
||||
|
||||
#define PNP_PORT_FLAG_16BITADDR (1<<0)
|
||||
#define PNP_PORT_FLAG_FIXED (1<<1)
|
||||
|
|
|
|||
Loading…
Reference in New Issue