Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 95576
b: refs/heads/master
c: f5d94ff
h: refs/heads/master
v: v3
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Apr 29, 2008
1 parent 3946c29 commit f9c7809
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db9eaeab3e7ab72d773820820f1ba33960ad24c4
refs/heads/master: f5d94ff014cb7e6212f40fc6644f3fd68507df33
8 changes: 4 additions & 4 deletions trunk/drivers/pnp/base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ void pnp_free_option(struct pnp_option *option);
int __pnp_add_device(struct pnp_dev *dev);
void __pnp_remove_device(struct pnp_dev *dev);

int pnp_check_port(struct pnp_dev * dev, int idx);
int pnp_check_mem(struct pnp_dev * dev, int idx);
int pnp_check_irq(struct pnp_dev * dev, int idx);
int pnp_check_dma(struct pnp_dev * dev, int idx);
int pnp_check_port(struct pnp_dev *dev, struct resource *res);
int pnp_check_mem(struct pnp_dev *dev, struct resource *res);
int pnp_check_irq(struct pnp_dev *dev, struct resource *res);
int pnp_check_dma(struct pnp_dev *dev, struct resource *res);

void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);

Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/pnp/manager.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
res->end = res->start + rule->size - 1;

/* run through until pnp_check_port is happy */
while (!pnp_check_port(dev, idx)) {
while (!pnp_check_port(dev, res)) {
res->start += rule->align;
res->end = res->start + rule->size - 1;
if (res->start > rule->max || !rule->align) {
Expand Down Expand Up @@ -108,7 +108,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
res->end = res->start + rule->size - 1;

/* run through until pnp_check_mem is happy */
while (!pnp_check_mem(dev, idx)) {
while (!pnp_check_mem(dev, res)) {
res->start += rule->align;
res->end = res->start + rule->size - 1;
if (res->start > rule->max || !rule->align) {
Expand Down Expand Up @@ -167,7 +167,7 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
for (i = 0; i < 16; i++) {
if (test_bit(xtab[i], rule->map)) {
res->start = res->end = xtab[i];
if (pnp_check_irq(dev, idx)) {
if (pnp_check_irq(dev, res)) {
dev_dbg(&dev->dev, " assign irq %d %d\n", idx,
(int) res->start);
return 1;
Expand Down Expand Up @@ -209,7 +209,7 @@ static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
for (i = 0; i < 8; i++) {
if (rule->map & (1 << xtab[i])) {
res->start = res->end = xtab[i];
if (pnp_check_dma(dev, idx)) {
if (pnp_check_dma(dev, res)) {
dev_dbg(&dev->dev, " assign dma %d %d\n", idx,
(int) res->start);
return;
Expand Down
20 changes: 8 additions & 12 deletions trunk/drivers/pnp/resource.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,14 +239,13 @@ void pnp_free_option(struct pnp_option *option)
#define cannot_compare(flags) \
((flags) & (IORESOURCE_UNSET | IORESOURCE_DISABLED))

int pnp_check_port(struct pnp_dev *dev, int idx)
int pnp_check_port(struct pnp_dev *dev, struct resource *res)
{
int i;
struct pnp_dev *tdev;
struct resource *res, *tres;
struct resource *tres;
resource_size_t *port, *end, *tport, *tend;

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

Expand Down Expand Up @@ -300,14 +299,13 @@ int pnp_check_port(struct pnp_dev *dev, int idx)
return 1;
}

int pnp_check_mem(struct pnp_dev *dev, int idx)
int pnp_check_mem(struct pnp_dev *dev, struct resource *res)
{
int i;
struct pnp_dev *tdev;
struct resource *res, *tres;
struct resource *tres;
resource_size_t *addr, *end, *taddr, *tend;

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

Expand Down Expand Up @@ -366,14 +364,13 @@ static irqreturn_t pnp_test_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}

int pnp_check_irq(struct pnp_dev *dev, int idx)
int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
{
int i;
struct pnp_dev *tdev;
struct resource *res, *tres;
struct resource *tres;
resource_size_t *irq;

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

/* if the resource doesn't exist, don't complain about it */
Expand Down Expand Up @@ -439,15 +436,14 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
return 1;
}

int pnp_check_dma(struct pnp_dev *dev, int idx)
int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
{
#ifndef CONFIG_IA64
int i;
struct pnp_dev *tdev;
struct resource *res, *tres;
struct resource *tres;
resource_size_t *dma;

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

/* if the resource doesn't exist, don't complain about it */
Expand Down

0 comments on commit f9c7809

Please sign in to comment.