Changeset 325

Show
Ignore:
Timestamp:
03/25/08 05:06:26 (8 months ago)
Author:
psmedley
Message:

Revert to ALSA code now that pci_set_dma() isn't type void

Location:
GPL/branches/uniaud32-2.0/alsa-kernel/pci
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/ali5451/ali5451.c

    r305 r325  
    21992199                return err; 
    22002200        /* check, if we can restrict PCI DMA transfers to 31 bits */ 
    2201 #ifndef TARGET_OS2 
    22022201        if (pci_set_dma_mask(pci, DMA_31BIT_MASK) < 0 || 
    22032202            pci_set_consistent_dma_mask(pci, DMA_31BIT_MASK) < 0) { 
    2204 #else 
    2205         if (!pci_dma_supported(pci, DMA_31BIT_MASK)) { 
    2206 #endif 
    22072203                snd_printk(KERN_ERR "architecture does not support " 
    22082204                           "31bit PCI busmaster DMA\n"); 

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/ca0106/ca0106_main.c

    r305 r325  
    13141314        if ((err = pci_enable_device(pci)) < 0) 
    13151315                return err; 
    1316 #ifndef TARGET_OS2 
    13171316        if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 || 
    13181317            pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) { 
    1319 #else 
    1320         if (!pci_dma_supported(pci, DMA_32BIT_MASK)) { 
    1321 #endif 
    13221318                printk(KERN_ERR "error to set 32bit mask DMA\n"); 
    13231319                pci_disable_device(pci); 

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/emu10k1/emu10k1_main.c

    r305 r325  
    18061806        /* set the DMA transfer mask */ 
    18071807        emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK; 
    1808 #ifndef TARGET_OS2 
    18091808        if (pci_set_dma_mask(pci, emu->dma_mask) < 0 || 
    18101809            pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) { 
    1811 #else 
    1812         if (!pci_dma_supported(pci, 0x0fffffff)) { 
    1813 #endif 
    18141810                snd_printk(KERN_ERR "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask); 
    18151811                kfree(emu); 

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/emu10k1/emu10k1x.c

    r305 r325  
    898898        if ((err = pci_enable_device(pci)) < 0) 
    899899                return err; 
    900 #ifndef TARGET_OS2 
    901900        if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || 
    902901            pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { 
    903 #else 
    904         if (!pci_dma_supported(pci, DMA_28BIT_MASK)) { 
    905 #endif 
    906902                snd_printk(KERN_ERR "error to set 28bit mask DMA\n"); 
    907903                pci_disable_device(pci); 

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/es1938.c

    r305 r325  
    16111611                return err; 
    16121612        /* check, if we can restrict PCI DMA transfers to 24 bits */ 
    1613 #ifndef TARGET_OS2 
    16141613        if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 || 
    16151614            pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) { 
    1616 #else 
    1617         if (!pci_dma_supported(pci, DMA_24BIT_MASK)) { 
    1618 #endif 
    16191615                snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); 
    16201616                pci_disable_device(pci); 

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/es1968.c

    r305 r325  
    25152515                return err; 
    25162516        /* check, if we can restrict PCI DMA transfers to 28 bits */ 
    2517 #ifndef TARGET_OS2 
    25182517        if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || 
    25192518            pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { 
    2520 #else 
    2521         if (!pci_dma_supported(pci, DMA_28BIT_MASK)) { 
    2522 #endif 
    25232519                snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); 
    25242520                pci_disable_device(pci); 

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/maestro3.c

    r305 r325  
    26832683 
    26842684        /* check, if we can restrict PCI DMA transfers to 28 bits */ 
    2685 #ifndef TARGET_OS2 
    26862685        if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || 
    26872686            pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { 
    2688 #else 
    2689         if (!pci_dma_supported(pci, DMA_28BIT_MASK)) { 
    2690 #endif 
    26912687                snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); 
    26922688                pci_disable_device(pci); 

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/trident/trident_main.c

    r305 r325  
    35463546                return err; 
    35473547        /* check, if we can restrict PCI DMA transfers to 30 bits */ 
    3548 #ifndef TARGET_OS2 
    35493548        if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0 || 
    35503549            pci_set_consistent_dma_mask(pci, DMA_30BIT_MASK) < 0) { 
    3551 #else 
    3552         if (!pci_dma_supported(pci, DMA_30BIT_MASK)) { 
    3553 #endif 
    35543550                snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n"); 
    35553551                pci_disable_device(pci);