[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: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index 16db670532c9a01c6ea1ad2caf5735e8da842702..7f7ec3314c931606ff8c12109adec0ace0dc693f 100644 (file)
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -520,7 +520,7 @@ static void __devexit bt878_remove(struct pci_dev *pci_dev)
 
        /* first disable interrupts before unmapping the memory! */
        btwrite(0, BT878_AINT_MASK);
-       btwrite(~0x0UL, BT878_AINT_STAT);
+       btwrite(~0U, BT878_AINT_STAT);
 
        /* disable PCI bus-mastering */
        pci_read_config_byte(bt->dev, PCI_COMMAND, &command);

diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c
index 2a7ea80c51ad5559410849935682049fbe826c19..0d76e7889202d22d3ae5a9e77564bc20532514fd 100644 (file)
--- a/sound/oss/btaudio.c
+++ b/sound/oss/btaudio.c
@@ -961,7 +961,7 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev,
        /* init hw */
         btwrite(0, REG_GPIO_DMA_CTL);
         btwrite(0, REG_INT_MASK);
-        btwrite(~0x0UL, REG_INT_STAT);
+        btwrite(~0U, REG_INT_STAT);
        pci_set_master(pci_dev);
 
        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)
        /* turn off all DMA / IRQs */
         btand(~15, REG_GPIO_DMA_CTL);
         btwrite(0, REG_INT_MASK);
-        btwrite(~0x0UL, REG_INT_STAT);
+        btwrite(~0U, REG_INT_STAT);
 
        /* unregister devices */
        if (digital) {