diff options
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-pci.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-ps3.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-ps3.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index f2618d17710d..c637207a1c80 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
| @@ -622,7 +622,7 @@ static int ehci_run (struct usb_hcd *hcd) | |||
| 622 | ehci_writel(ehci, 0, &ehci->regs->segment); | 622 | ehci_writel(ehci, 0, &ehci->regs->segment); |
| 623 | #if 0 | 623 | #if 0 |
| 624 | // this is deeply broken on almost all architectures | 624 | // this is deeply broken on almost all architectures |
| 625 | if (!dma_set_mask(hcd->self.controller, DMA_64BIT_MASK)) | 625 | if (!dma_set_mask(hcd->self.controller, DMA_BIT_MASK(64))) |
| 626 | ehci_info(ehci, "enabled 64bit DMA\n"); | 626 | ehci_info(ehci, "enabled 64bit DMA\n"); |
| 627 | #endif | 627 | #endif |
| 628 | } | 628 | } |
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index abb9a7706ec7..5aa8bce90e1f 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c | |||
| @@ -108,7 +108,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd) | |||
| 108 | case 0x00d8: /* CK8 */ | 108 | case 0x00d8: /* CK8 */ |
| 109 | case 0x00e8: /* CK8S */ | 109 | case 0x00e8: /* CK8S */ |
| 110 | if (pci_set_consistent_dma_mask(pdev, | 110 | if (pci_set_consistent_dma_mask(pdev, |
| 111 | DMA_31BIT_MASK) < 0) | 111 | DMA_BIT_MASK(31)) < 0) |
| 112 | ehci_warn(ehci, "can't enable NVidia " | 112 | ehci_warn(ehci, "can't enable NVidia " |
| 113 | "workaround for >2GB RAM\n"); | 113 | "workaround for >2GB RAM\n"); |
| 114 | break; | 114 | break; |
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c index 9c9da35abc6c..1ba9f9a8c308 100644 --- a/drivers/usb/host/ehci-ps3.c +++ b/drivers/usb/host/ehci-ps3.c | |||
| @@ -81,7 +81,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev) | |||
| 81 | int result; | 81 | int result; |
| 82 | struct usb_hcd *hcd; | 82 | struct usb_hcd *hcd; |
| 83 | unsigned int virq; | 83 | unsigned int virq; |
| 84 | static u64 dummy_mask = DMA_32BIT_MASK; | 84 | static u64 dummy_mask = DMA_BIT_MASK(32); |
| 85 | 85 | ||
| 86 | if (usb_disabled()) { | 86 | if (usb_disabled()) { |
| 87 | result = -ENODEV; | 87 | result = -ENODEV; |
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c index 3c1a3b5f89f1..3d1910317328 100644 --- a/drivers/usb/host/ohci-ps3.c +++ b/drivers/usb/host/ohci-ps3.c | |||
| @@ -80,7 +80,7 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev) | |||
| 80 | int result; | 80 | int result; |
| 81 | struct usb_hcd *hcd; | 81 | struct usb_hcd *hcd; |
| 82 | unsigned int virq; | 82 | unsigned int virq; |
| 83 | static u64 dummy_mask = DMA_32BIT_MASK; | 83 | static u64 dummy_mask = DMA_BIT_MASK(32); |
| 84 | 84 | ||
| 85 | if (usb_disabled()) { | 85 | if (usb_disabled()) { |
| 86 | result = -ENODEV; | 86 | result = -ENODEV; |
