diff options
Diffstat (limited to 'drivers/pnp/isapnp/core.c')
-rw-r--r-- | drivers/pnp/isapnp/core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index 46455fbab6d5..e851160e14f0 100644 --- a/drivers/pnp/isapnp/core.c +++ b/drivers/pnp/isapnp/core.c | |||
@@ -901,7 +901,7 @@ static int isapnp_get_resources(struct pnp_dev *dev) | |||
901 | { | 901 | { |
902 | int i, ret; | 902 | int i, ret; |
903 | 903 | ||
904 | dev_dbg(&dev->dev, "get resources\n"); | 904 | pnp_dbg(&dev->dev, "get resources\n"); |
905 | pnp_init_resources(dev); | 905 | pnp_init_resources(dev); |
906 | isapnp_cfg_begin(dev->card->number, dev->number); | 906 | isapnp_cfg_begin(dev->card->number, dev->number); |
907 | dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE); | 907 | dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE); |
@@ -939,13 +939,13 @@ static int isapnp_set_resources(struct pnp_dev *dev) | |||
939 | struct resource *res; | 939 | struct resource *res; |
940 | int tmp; | 940 | int tmp; |
941 | 941 | ||
942 | dev_dbg(&dev->dev, "set resources\n"); | 942 | pnp_dbg(&dev->dev, "set resources\n"); |
943 | isapnp_cfg_begin(dev->card->number, dev->number); | 943 | isapnp_cfg_begin(dev->card->number, dev->number); |
944 | dev->active = 1; | 944 | dev->active = 1; |
945 | for (tmp = 0; tmp < ISAPNP_MAX_PORT; tmp++) { | 945 | for (tmp = 0; tmp < ISAPNP_MAX_PORT; tmp++) { |
946 | res = pnp_get_resource(dev, IORESOURCE_IO, tmp); | 946 | res = pnp_get_resource(dev, IORESOURCE_IO, tmp); |
947 | if (pnp_resource_enabled(res)) { | 947 | if (pnp_resource_enabled(res)) { |
948 | dev_dbg(&dev->dev, " set io %d to %#llx\n", | 948 | pnp_dbg(&dev->dev, " set io %d to %#llx\n", |
949 | tmp, (unsigned long long) res->start); | 949 | tmp, (unsigned long long) res->start); |
950 | isapnp_write_word(ISAPNP_CFG_PORT + (tmp << 1), | 950 | isapnp_write_word(ISAPNP_CFG_PORT + (tmp << 1), |
951 | res->start); | 951 | res->start); |
@@ -957,14 +957,14 @@ static int isapnp_set_resources(struct pnp_dev *dev) | |||
957 | int irq = res->start; | 957 | int irq = res->start; |
958 | if (irq == 2) | 958 | if (irq == 2) |
959 | irq = 9; | 959 | irq = 9; |
960 | dev_dbg(&dev->dev, " set irq %d to %d\n", tmp, irq); | 960 | pnp_dbg(&dev->dev, " set irq %d to %d\n", tmp, irq); |
961 | isapnp_write_byte(ISAPNP_CFG_IRQ + (tmp << 1), irq); | 961 | isapnp_write_byte(ISAPNP_CFG_IRQ + (tmp << 1), irq); |
962 | } | 962 | } |
963 | } | 963 | } |
964 | for (tmp = 0; tmp < ISAPNP_MAX_DMA; tmp++) { | 964 | for (tmp = 0; tmp < ISAPNP_MAX_DMA; tmp++) { |
965 | res = pnp_get_resource(dev, IORESOURCE_DMA, tmp); | 965 | res = pnp_get_resource(dev, IORESOURCE_DMA, tmp); |
966 | if (pnp_resource_enabled(res)) { | 966 | if (pnp_resource_enabled(res)) { |
967 | dev_dbg(&dev->dev, " set dma %d to %lld\n", | 967 | pnp_dbg(&dev->dev, " set dma %d to %lld\n", |
968 | tmp, (unsigned long long) res->start); | 968 | tmp, (unsigned long long) res->start); |
969 | isapnp_write_byte(ISAPNP_CFG_DMA + tmp, res->start); | 969 | isapnp_write_byte(ISAPNP_CFG_DMA + tmp, res->start); |
970 | } | 970 | } |
@@ -972,7 +972,7 @@ static int isapnp_set_resources(struct pnp_dev *dev) | |||
972 | for (tmp = 0; tmp < ISAPNP_MAX_MEM; tmp++) { | 972 | for (tmp = 0; tmp < ISAPNP_MAX_MEM; tmp++) { |
973 | res = pnp_get_resource(dev, IORESOURCE_MEM, tmp); | 973 | res = pnp_get_resource(dev, IORESOURCE_MEM, tmp); |
974 | if (pnp_resource_enabled(res)) { | 974 | if (pnp_resource_enabled(res)) { |
975 | dev_dbg(&dev->dev, " set mem %d to %#llx\n", | 975 | pnp_dbg(&dev->dev, " set mem %d to %#llx\n", |
976 | tmp, (unsigned long long) res->start); | 976 | tmp, (unsigned long long) res->start); |
977 | isapnp_write_word(ISAPNP_CFG_MEM + (tmp << 3), | 977 | isapnp_write_word(ISAPNP_CFG_MEM + (tmp << 3), |
978 | (res->start >> 8) & 0xffff); | 978 | (res->start >> 8) & 0xffff); |