• Sylvain "ythier" Hitier's avatar
    3c59x: fix bad split of cpu_to_le32(pci_map_single()) · 88b09a6d
    Sylvain "ythier" Hitier authored
    In commit 6f2b6a30,
      # 3c59x: Add dma error checking and recovery
    the intent is to split out the mapping from the byte-swapping in order to
    insert a dma_mapping_error() check.
    
    Kinda this semantic patch:
    
        // See http://coccinelle.lip6.fr/
        //
        // Beware, grouik-and-dirty!
        @@
        expression DEV, X, Y, Z;
        @@
        -   cpu_to_le32(pci_map_single(DEV, X, Y, Z))
        +   dma_addr_t addr = pci_map_single(DEV, X, Y, Z);
        +   if (dma_mapping_error(&DEV->dev, addr))
        +       /* snip */;
        +   cpu_to_le32(addr)
    
    However, the #else part (of the #if DO_ZEROCOPY test) is changed this way:
    
        -   cpu_to_le32(pci_map_single(DEV, X, Y, Z))
        +   dma_addr_t addr = cpu_to_le32(pci_map_single(DEV, X, Y, Z));
        //                    ^^^^^^^^^^^
        //                    That mismatches the 3 other changes!
        +   if (dma_mapping_error(&DEV->dev, addr))
        +       /* snip */;
        +   cpu_to_le32(addr)
    
    Let's remove the leftover cpu_to_le32() for coherency.
    
    v2: Better changelog.
    v3: Add Acked-by
    
    Fixes: 6f2b6a30
      # 3c59x: Add dma error checking and recovery
    Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
    Signed-off-by: default avatarSylvain "ythier" Hitier <sylvain.hitier@gmail.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    88b09a6d
3c59x.c 103 KB