From patchwork Mon Oct 7 01:55:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cho KyongHo X-Patchwork-Id: 2994171 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B75CC9F1C4 for ; Mon, 7 Oct 2013 02:36:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B458F2012B for ; Mon, 7 Oct 2013 02:36:45 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A403E200F0 for ; Mon, 7 Oct 2013 02:36:44 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VT036-00040C-Bl; Mon, 07 Oct 2013 01:55:52 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VT02i-0006qe-Li; Mon, 07 Oct 2013 01:55:28 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VT02f-0006ph-Ud for linux-arm-kernel@lists.infradead.org; Mon, 07 Oct 2013 01:55:27 +0000 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MU900KHTZYIE010@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 07 Oct 2013 10:55:04 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.51]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 98.9A.31253.87412525; Mon, 07 Oct 2013 10:55:04 +0900 (KST) X-AuditID: cbfee690-b7f3b6d000007a15-f9-525214783c5d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 60.3E.05832.87412525; Mon, 07 Oct 2013 10:55:04 +0900 (KST) Received: from DO-PULLIP-CHO07.dsn.sec.samsung.com ([12.23.118.94]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MU900FS1ZZSYC20@mmp2.samsung.com>; Mon, 07 Oct 2013 10:55:04 +0900 (KST) Date: Mon, 07 Oct 2013 10:55:04 +0900 From: Cho KyongHo To: Linux ARM Kernel , Linux DeviceTree , Linux IOMMU , Linux Kernel , Linux Samsung SOC Subject: [PATCH v10 08/20] iommu/exynos: remove dbgname from drvdata of a System MMU Message-id: <20131007105504.9c27caf2fb0885d1dae8312d@samsung.com> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.10.14; i686-pc-mingw32) MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGIsWRmVeSWpSXmKPExsVy+t8zY90KkaAgg/tHNSzu3D3HajH/CJB4 deQHk8WC/dYWnbM3sFv0LrjKZrHp8TVWi8u75rBZzDi/j8niwoqN7BZTFh1mtTj8pp3V4uSf XkaLluu9TBbrZ7xmsZh5aw2Lg4DHk4PzmDxmN1xk8fh3uJ/J4861PWwem5fUe0y+sZzRo2/L KkaPz5vkPK4cPcMUwBnFZZOSmpNZllqkb5fAlbHkXCtbwWaFii0buBoY90p1MXJySAiYSKxc tIcNwhaTuHBvPZDNxSEksIxR4s39qywwRXs2PGSFSExnlGjbe5gRwpnEJLG0Zy1YO4uAqsTn FXvZQWw2AS2J1XOPgxWJCLQxSXxtPMQC4jALnGaWWLV7BXMXIweHsECYxKyeQpAGXgFHifan kxkh1llIXGjqYIeIC0r8mHwP7AxmoKGbtzWxQtjyEpvXvGUGmSkhMJFD4t+FV6wQVwhIfJsM sowDKCErsekAM8RMSYmDK26wTGAUmYVk7CwkY2chGbuAkXkVo2hqQXJBcVJ6kYlecWJucWle ul5yfu4mRkgcT9jBeO+A9SHGZKCVE5mlRJPzgWkgryTe0NjMyMLUxNTYyNzSjDRhJXFe9Rbr QCGB9MSS1OzU1ILUovii0pzU4kOMTBycUg2MFnGPHVNmPk//PvvoW7tT12Kmn/+St/zJKQYD oZ88QlYfEkWaGETO5q3p/7Z3ekPFKq74vugPtzbnnI7hzDv/yZ+F16l2m69dSsehBbkqs511 Rb3CSvOyC+3azVldy8MnLb355+O+KWI5B1Uny1oWGOzuSFg+se5Fw8PDf1nbPgk2p6SrP/6r xFKckWioxVxUnAgAicnN6fkCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMKsWRmVeSWpSXmKPExsVy+t9jQd0KkaAggyu7lSzu3D3HajH/CJB4 deQHk8WC/dYWnbM3sFv0LrjKZrHp8TVWi8u75rBZzDi/j8niwoqN7BZTFh1mtTj8pp3V4uSf XkaLluu9TBbrZ7xmsZh5aw2Lg4DHk4PzmDxmN1xk8fh3uJ/J4861PWwem5fUe0y+sZzRo2/L KkaPz5vkPK4cPcMUwBnVwGiTkZqYklqkkJqXnJ+SmZduq+QdHO8cb2pmYKhraGlhrqSQl5ib aqvk4hOg65aZA/SGkkJZYk4pUCggsbhYSd8O04TQEDddC5jGCF3fkCC4HiMDNJCwjjFjyblW toLNChVbNnA1MO6V6mLk5JAQMJHYs+EhK4QtJnHh3nq2LkYuDiGB6YwSbXsPM0I4k5gklvas ZQOpYhFQlfi8Yi87iM0moCWxeu5xsCIRgTYmia+Nh1hAHGaB08wSq3avYO5i5OAQFgiTmNVT CNLAK+Ao0f50MiPEOguJC00d7BBxQYkfk++xgNjMQEM3b2tihbDlJTavecs8gZFvFpKyWUjK ZiEpW8DIvIpRNLUguaA4KT3XSK84Mbe4NC9dLzk/dxMjOEk8k97BuKrB4hCjAAejEg/vjvuB QUKsiWXFlbmHGCU4mJVEeC/VAYV4UxIrq1KL8uOLSnNSiw8xJgO9PZFZSjQ5H5jA8kriDY1N zIwsjcwsjEzMzUkTVhLnPdhqHSgkkJ5YkpqdmlqQWgSzhYmDU6qBccaa6aHtvoGGzdIPbsmp 9mkejOwLbLHhuDt7Qd73reaXF9+ujDqp+iem/8Oek3nhcxr3xyxfdDxQ58BbH8Glu3Z3PZpV fzprsvf5Fzmlx3+KvRE+9HaDiFiOZEOixsGFwtOFC569ZpOwvmL5wyp10u6X2zT8fojkrDZs LWNYs6KxJfqm7R1HDiWW4oxEQy3mouJEAKdghC9WAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131006_215526_550908_97C48C3E X-CRM114-Status: GOOD ( 12.21 ) X-Spam-Score: -6.9 (------) Cc: Kukjin Kim , Prathyush , Grant Grundler , Joerg Roedel , Subash Patel , Sachin Kamat , Sylwester Nawrocki , Varun Sethi , Antonios Motakis , Tomasz Figa , Rahul Sharma X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch removes dbgname member from sysmmu_drvdata structure. Kernel message for debugging already has the name of a single System MMU node. Signed-off-by: Cho KyongHo --- drivers/iommu/exynos-iommu.c | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 0092359..735d75e 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -170,7 +170,6 @@ struct sysmmu_drvdata { struct list_head node; /* entry of exynos_iommu_domain.clients */ struct device *sysmmu; /* System MMU's device descriptor */ struct device *dev; /* Owner of system MMU */ - char *dbgname; void __iomem *sfrbase; struct clk *clk; int activations; @@ -328,8 +327,8 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id) if (!ret && (itype != SYSMMU_FAULT_UNKNOWN)) __raw_writel(1 << itype, data->sfrbase + REG_INT_CLEAR); else - dev_dbg(data->sysmmu, "(%s) %s is not handled.\n", - data->dbgname, sysmmu_fault_name[itype]); + dev_dbg(data->sysmmu, "%s is not handled.\n", + sysmmu_fault_name[itype]); if (itype != SYSMMU_FAULT_UNKNOWN) sysmmu_unblock(data->sfrbase); @@ -362,10 +361,10 @@ finish: write_unlock_irqrestore(&data->lock, flags); if (disabled) - dev_dbg(data->sysmmu, "(%s) Disabled\n", data->dbgname); + dev_dbg(data->sysmmu, "Disabled\n"); else - dev_dbg(data->sysmmu, "(%s) %d times left to be disabled\n", - data->dbgname, data->activations); + dev_dbg(data->sysmmu, "%d times left to be disabled\n", + data->activations); return disabled; } @@ -392,7 +391,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data, ret = 1; } - dev_dbg(data->sysmmu, "(%s) Already enabled\n", data->dbgname); + dev_dbg(data->sysmmu, "Already enabled\n"); goto finish; } @@ -414,7 +413,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data, data->domain = domain; - dev_dbg(data->sysmmu, "(%s) Enabled\n", data->dbgname); + dev_dbg(data->sysmmu, "Enabled\n"); finish: write_unlock_irqrestore(&data->lock, flags); @@ -430,16 +429,15 @@ int exynos_sysmmu_enable(struct device *dev, unsigned long pgtable) ret = pm_runtime_get_sync(data->sysmmu); if (ret < 0) { - dev_dbg(data->sysmmu, "(%s) Failed to enable\n", data->dbgname); + dev_dbg(data->sysmmu, "Failed to enable\n"); return ret; } ret = __exynos_sysmmu_enable(data, pgtable, NULL); if (WARN_ON(ret < 0)) { pm_runtime_put(data->sysmmu); - dev_err(data->sysmmu, - "(%s) Already enabled with page table %#lx\n", - data->dbgname, data->pgtable); + dev_err(data->sysmmu, "Already enabled with page table %#lx\n", + data->pgtable); } else { data->dev = dev; } @@ -485,9 +483,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, sysmmu_unblock(data->sfrbase); } } else { - dev_dbg(data->sysmmu, - "(%s) Disabled. Skipping invalidating TLB.\n", - data->dbgname); + dev_dbg(data->sysmmu, "Disabled. Skipping invalidating TLB.\n"); } read_unlock_irqrestore(&data->lock, flags); @@ -506,9 +502,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev) sysmmu_unblock(data->sfrbase); } } else { - dev_dbg(data->sysmmu, - "(%s) Disabled. Skipping invalidating TLB.\n", - data->dbgname); + dev_dbg(data->sysmmu, "Disabled. Skipping invalidating TLB.\n"); } read_unlock_irqrestore(&data->lock, flags); @@ -563,8 +557,6 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) data->clk = NULL; dev_dbg(dev, "No clock descriptor registered\n"); } - - data->dbgname = platdata->dbgname; } data->sysmmu = dev; @@ -577,7 +569,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) pm_runtime_enable(dev); - dev_dbg(dev, "(%s) Initialized\n", data->dbgname); + dev_dbg(dev, "Initialized\n"); return 0; err_irq: free_irq(platform_get_irq(pdev, 0), data);