Commit a408e529 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] 64bit cleanup in bt878 and btaudio

~0x0UL passed in u32 argument will do what the authors wanted, but it's
a hell of a silly way to spell ~0U on 32bit boxen and it generates warnings on
64bit boxen (we get correct value after truncation, but compiler doesn't
know that ;-)
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1eaba3f2
...@@ -520,7 +520,7 @@ static void __devexit bt878_remove(struct pci_dev *pci_dev) ...@@ -520,7 +520,7 @@ static void __devexit bt878_remove(struct pci_dev *pci_dev)
/* first disable interrupts before unmapping the memory! */ /* first disable interrupts before unmapping the memory! */
btwrite(0, BT878_AINT_MASK); btwrite(0, BT878_AINT_MASK);
btwrite(~0x0UL, BT878_AINT_STAT); btwrite(~0U, BT878_AINT_STAT);
/* disable PCI bus-mastering */ /* disable PCI bus-mastering */
pci_read_config_byte(bt->dev, PCI_COMMAND, &command); pci_read_config_byte(bt->dev, PCI_COMMAND, &command);
......
...@@ -961,7 +961,7 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev, ...@@ -961,7 +961,7 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev,
/* init hw */ /* init hw */
btwrite(0, REG_GPIO_DMA_CTL); btwrite(0, REG_GPIO_DMA_CTL);
btwrite(0, REG_INT_MASK); btwrite(0, REG_INT_MASK);
btwrite(~0x0UL, REG_INT_STAT); btwrite(~0U, REG_INT_STAT);
pci_set_master(pci_dev); pci_set_master(pci_dev);
if ((rc = request_irq(bta->irq, btaudio_irq, SA_SHIRQ|SA_INTERRUPT, if ((rc = request_irq(bta->irq, btaudio_irq, SA_SHIRQ|SA_INTERRUPT,
...@@ -1033,7 +1033,7 @@ static void __devexit btaudio_remove(struct pci_dev *pci_dev) ...@@ -1033,7 +1033,7 @@ static void __devexit btaudio_remove(struct pci_dev *pci_dev)
/* turn off all DMA / IRQs */ /* turn off all DMA / IRQs */
btand(~15, REG_GPIO_DMA_CTL); btand(~15, REG_GPIO_DMA_CTL);
btwrite(0, REG_INT_MASK); btwrite(0, REG_INT_MASK);
btwrite(~0x0UL, REG_INT_STAT); btwrite(~0U, REG_INT_STAT);
/* unregister devices */ /* unregister devices */
if (digital) { if (digital) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment