From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752965AbbLUXv2 (ORCPT ); Mon, 21 Dec 2015 18:51:28 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:33118 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbbLUXsL (ORCPT ); Mon, 21 Dec 2015 18:48:11 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 71/83] s390_dma_alloc(): use page_address() Date: Mon, 21 Dec 2015 23:47:44 +0000 Message-Id: <1450741676-5865-71-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20151221234615.GW20997@ZenIV.linux.org.uk> References: <20151221234615.GW20997@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro ... rather than open-coding it as (void *)page_to_phys() - those expand to the same thing on s390 (no highmem and __va is an identity mapping), but it's more readable (and less confusing) that way. Signed-off-by: Al Viro --- arch/s390/pci/pci_dma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c index afa4be1..6ea4d13 100644 --- a/arch/s390/pci/pci_dma.c +++ b/arch/s390/pci/pci_dma.c @@ -355,7 +355,7 @@ static void *s390_dma_alloc(struct device *dev, size_t size, { struct zpci_dev *zdev = to_zpci(to_pci_dev(dev)); struct page *page; - unsigned long pa; + void *p; dma_addr_t map; size = PAGE_ALIGN(size); @@ -363,20 +363,20 @@ static void *s390_dma_alloc(struct device *dev, size_t size, if (!page) return NULL; - pa = page_to_phys(page); - memset((void *) pa, 0, size); + p = page_address(page); + memset(p, 0, size); map = s390_dma_map_pages(dev, page, 0, size, DMA_BIDIRECTIONAL, NULL); if (dma_mapping_error(dev, map)) { - free_pages((void *)pa, get_order(size)); + free_pages(p, get_order(size)); return NULL; } atomic64_add(size / PAGE_SIZE, &zdev->allocated_pages); if (dma_handle) *dma_handle = map; - return (void *) pa; + return p; } static void s390_dma_free(struct device *dev, size_t size, -- 2.1.4