Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753403AbdHJXSu (ORCPT ); Thu, 10 Aug 2017 19:18:50 -0400 Received: from m12-16.163.com ([220.181.12.16]:58570 "EHLO m12-16.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752440AbdHJXSt (ORCPT ); Thu, 10 Aug 2017 19:18:49 -0400 From: Pan Bian To: Greg Kroah-Hartman , Guenter Roeck , Dmitry Torokhov , Wei Yongjun , Thierry Escande , Christophe JAILLET , Wei-Ning Huang Cc: linux-kernel@vger.kernel.org, Pan Bian Subject: [V3] firmware: vpd: use memunmap instead of iounmap Date: Fri, 11 Aug 2017 07:13:13 +0800 Message-Id: <1502406793-26329-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: EMCowAA3m22L6IxZkEjKBw--.12918S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7CF47WF18Xr18uFWrCw1Utrb_yoW8Ar1rpF W7GFWfCr17Jw48ZwnrJw4UuFyYvFW8JFy7uFy7Z343A3Zxury0kFyrKFyq9rWakrWfZa47 Xa18uayUX3WUAwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jgYFAUUUUU= X-Originating-IP: [1.202.67.190] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBZBswclQG9gygKwAAse Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1628 Lines: 57 In functions vpd_sections_init() and vpd_section_init(), iounmap() is used to unmap memory. However, in these cases, memunmap() should be used. Signed-off-by: Pan Bian --- V2: change error label err_iounmap to err_memunmap V3: add changes from V1 to V2 --- drivers/firmware/google/vpd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c index 7894572..35e553b 100644 --- a/drivers/firmware/google/vpd.c +++ b/drivers/firmware/google/vpd.c @@ -202,7 +202,7 @@ static int vpd_section_init(const char *name, struct vpd_section *sec, sec->raw_name = kasprintf(GFP_KERNEL, "%s_raw", name); if (!sec->raw_name) { err = -ENOMEM; - goto err_iounmap; + goto err_memunmap; } sysfs_bin_attr_init(&sec->bin_attr); @@ -233,8 +233,8 @@ static int vpd_section_init(const char *name, struct vpd_section *sec, sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr); err_free_raw_name: kfree(sec->raw_name); -err_iounmap: - iounmap(sec->baseaddr); +err_memunmap: + memunmap(sec->baseaddr); return err; } @@ -245,7 +245,7 @@ static int vpd_section_destroy(struct vpd_section *sec) kobject_put(sec->kobj); sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr); kfree(sec->raw_name); - iounmap(sec->baseaddr); + memunmap(sec->baseaddr); } return 0; @@ -262,7 +262,7 @@ static int vpd_sections_init(phys_addr_t physaddr) return -ENOMEM; memcpy_fromio(&header, temp, sizeof(struct vpd_cbmem)); - iounmap(temp); + memunmap(temp); if (header.magic != VPD_CBMEM_MAGIC) return -ENODEV; -- 1.9.1