diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-12-08 09:41:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-12-08 09:41:29 -0500 |
| commit | 1265edb8fd2869d17128f1d60683dd6f4191d550 (patch) | |
| tree | 795e037b9dcaf8fced9777673032f01fe5271667 /arch/arm/common | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
| parent | 03d14a5536cf5611d27a106137a814c8f1135ddd (diff) | |
Merge branch 'pxa-fixes'
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/it8152.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c index c03de9bfd76b..97b7dc13d9aa 100644 --- a/arch/arm/common/it8152.c +++ b/arch/arm/common/it8152.c | |||
| @@ -70,8 +70,6 @@ static inline void it8152_irq(int irq) | |||
| 70 | { | 70 | { |
| 71 | struct irq_desc *desc; | 71 | struct irq_desc *desc; |
| 72 | 72 | ||
| 73 | printk(KERN_DEBUG "===> %s: irq=%d\n", __FUNCTION__, irq); | ||
| 74 | |||
| 75 | desc = irq_desc + irq; | 73 | desc = irq_desc + irq; |
| 76 | desc_handle_irq(irq, desc); | 74 | desc_handle_irq(irq, desc); |
| 77 | } | 75 | } |
| @@ -106,8 +104,6 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc) | |||
| 106 | int bits_pd, bits_lp, bits_ld; | 104 | int bits_pd, bits_lp, bits_ld; |
| 107 | int i; | 105 | int i; |
| 108 | 106 | ||
| 109 | printk(KERN_DEBUG "=> %s: irq = %d\n", __FUNCTION__, irq); | ||
| 110 | |||
| 111 | while (1) { | 107 | while (1) { |
| 112 | /* Read all */ | 108 | /* Read all */ |
| 113 | bits_pd = __raw_readl(IT8152_INTC_PDCNIRR); | 109 | bits_pd = __raw_readl(IT8152_INTC_PDCNIRR); |
| @@ -293,8 +289,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) | |||
| 293 | */ | 289 | */ |
| 294 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask) | 290 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask) |
| 295 | { | 291 | { |
| 296 | printk(KERN_DEBUG "%s: %s %llx\n", | 292 | dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask); |
| 297 | __FUNCTION__, dev->dev.bus_id, mask); | ||
| 298 | if (mask >= PHYS_OFFSET + SZ_64M - 1) | 293 | if (mask >= PHYS_OFFSET + SZ_64M - 1) |
| 299 | return 0; | 294 | return 0; |
| 300 | 295 | ||
| @@ -304,8 +299,7 @@ int pci_set_dma_mask(struct pci_dev *dev, u64 mask) | |||
| 304 | int | 299 | int |
| 305 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | 300 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) |
| 306 | { | 301 | { |
| 307 | printk(KERN_DEBUG "%s: %s %llx\n", | 302 | dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask); |
| 308 | __FUNCTION__, dev->dev.bus_id, mask); | ||
| 309 | if (mask >= PHYS_OFFSET + SZ_64M - 1) | 303 | if (mask >= PHYS_OFFSET + SZ_64M - 1) |
| 310 | return 0; | 304 | return 0; |
| 311 | 305 | ||
