Merge tag 'dma-mapping-5.3' of git://git.infradead.org/users/hch/dma-mapping

[sfrench/cifs-2.6.git] / arch / arm / mm / dma-mapping.c

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index bdf0d236aaee36ffb659ef614e17a4b3d0d03faa..4789c60a86e34552411367282be7309f0d8f779a 100644 (file)
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  linux/arch/arm/mm/dma-mapping.c
  *
  *  Copyright (C) 2000-2004 Russell King
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  *  DMA uncached mapping support.
  */
 #include <linux/module.h>
@@ -478,8 +475,7 @@ void __init dma_contiguous_remap(void)
        }
 }
 
-static int __dma_update_pte(pte_t *pte, pgtable_t token, unsigned long addr,
-                           void *data)
+static int __dma_update_pte(pte_t *pte, unsigned long addr, void *data)
 {
        struct page *page = virt_to_page(addr);
        pgprot_t prot = *(pgprot_t *)data;