aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp
diff options
context:
space:
mode:
authorYang Hongyang <yanghy@cn.fujitsu.com>2009-04-06 22:01:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:12 -0400
commit2f4f27d42a301ed147e50c2edbcd27bb8990bc8e (patch)
tree48d3ddb39d97bd7b9a176395c5a97b0001b2b84c /drivers/pnp
parentce0b620160e6d15a7f5b4b00cd7b8bd956d427d1 (diff)
dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)
Replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24) Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pnp')
-rw-r--r--drivers/pnp/card.c2
-rw-r--r--drivers/pnp/core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index efea128f02d..4a651f69e17 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -167,7 +167,7 @@ struct pnp_card *pnp_alloc_card(struct pnp_protocol *protocol, int id, char *pnp
167 card->dev.parent = &card->protocol->dev; 167 card->dev.parent = &card->protocol->dev;
168 dev_set_name(&card->dev, "%02x:%02x", card->protocol->number, card->number); 168 dev_set_name(&card->dev, "%02x:%02x", card->protocol->number, card->number);
169 169
170 card->dev.coherent_dma_mask = DMA_24BIT_MASK; 170 card->dev.coherent_dma_mask = DMA_BIT_MASK(24);
171 card->dev.dma_mask = &card->dev.coherent_dma_mask; 171 card->dev.dma_mask = &card->dev.coherent_dma_mask;
172 172
173 dev_id = pnp_add_card_id(card, pnpid); 173 dev_id = pnp_add_card_id(card, pnpid);
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 14814f23173..5dba90995d9 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -137,7 +137,7 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid
137 INIT_LIST_HEAD(&dev->options); 137 INIT_LIST_HEAD(&dev->options);
138 dev->protocol = protocol; 138 dev->protocol = protocol;
139 dev->number = id; 139 dev->number = id;
140 dev->dma_mask = DMA_24BIT_MASK; 140 dev->dma_mask = DMA_BIT_MASK(24);
141 141
142 dev->dev.parent = &dev->protocol->dev; 142 dev->dev.parent = &dev->protocol->dev;
143 dev->dev.bus = &pnp_bus_type; 143 dev->dev.bus = &pnp_bus_type;