From patchwork Thu Oct 6 23:23:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 9365437 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C4D5E600C8 for ; Thu, 6 Oct 2016 23:24:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4F3329285 for ; Thu, 6 Oct 2016 23:24:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A943D29288; Thu, 6 Oct 2016 23:24:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3810429285 for ; Thu, 6 Oct 2016 23:24:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755882AbcJFXXh (ORCPT ); Thu, 6 Oct 2016 19:23:37 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:48563 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753048AbcJFXXg (ORCPT ); Thu, 6 Oct 2016 19:23:36 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4F72861AC6; Thu, 6 Oct 2016 23:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1475796195; bh=QgF9a2b5MpiyJX2EG/ePtm7avK/3N5UffhmjnYgpti4=; h=From:To:Cc:Subject:Date:From; b=cuUwL9ydPoYXyGvVUOINAHqiBEcAoEbvUNAFsON897ZcCKWyFESISY/mr0oZDf2Bb CaI9z0hBZkEifS7qZUHzI/JRv2dWA6Ud7SbC7iacTcglUlbsKjlp34tYZppxbDzM8N XrHp+//L4IvcH+GPgVjq5KrpIYtLPMpOhr79l/fs= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C631E61849; Thu, 6 Oct 2016 23:23:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1475796194; bh=QgF9a2b5MpiyJX2EG/ePtm7avK/3N5UffhmjnYgpti4=; h=From:To:Cc:Subject:Date:From; b=JkW3XeYqKDb2FacmY3knw8CrlDbhWdwtxSkRG/5lFg/ENNmSIxKFHFNiKaeVMFywH dH/3YyX5ghA6sTCyAuho7LRmS/mZDWJz86Fw5vdQQp9DXZZVC9x11tuiEvmEVks0Vz S4gh+U+Fh4+75hFM1r9iYE23k0xFk5nJsGRsB4wA= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org C631E61849 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: dmaengine@vger.kernel.org, timur@codeaurora.org, cov@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , linux-kernel@vger.kernel.org Subject: [PATCH] dmaengine: qcom_hidma: cleanup sysfs entries during remove Date: Thu, 6 Oct 2016 19:23:09 -0400 Message-Id: <1475796189-26553-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The 4.8-rc8 kernel is printing duplicate file entry warnings while removing the HIDMA object. This is caused by stale sysfs entries remaining from the previous execution. _sysfs_warn_dup+0x5c/0x78 sysfs_add_file_mode_ns+0x13c/0x1c0 sysfs_create_file_ns+0x2c/0x40 device_create_file+0x54/0xa0 hidma_probe+0x7c8/0x808 Create hidma_sysfs_init and hidma_sysfs_uninit functions and call them from the probe and remove path. To do proper clean up, adding the attrs object to the device data structure to keep it around until remove call is made. Signed-off-by: Sinan Kaya --- drivers/dma/qcom/hidma.c | 31 +++++++++++++++++++++++++------ drivers/dma/qcom/hidma.h | 3 +++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c index f4fe4ee..414ea12 100644 --- a/drivers/dma/qcom/hidma.c +++ b/drivers/dma/qcom/hidma.c @@ -578,8 +578,17 @@ static ssize_t hidma_show_values(struct device *dev, return strlen(buf); } -static int hidma_create_sysfs_entry(struct hidma_dev *dev, char *name, - int mode) +static int hidma_sysfs_uninit(struct hidma_dev *dev) +{ + if (!dev->chid_attrs) + return -ENOMEM; + + device_remove_file(dev->ddev.dev, dev->chid_attrs); + return 0; +} + +static struct device_attribute* +hidma_create_sysfs_entry(struct hidma_dev *dev, char *name, int mode) { struct device_attribute *attrs; char *name_copy; @@ -587,20 +596,29 @@ static int hidma_create_sysfs_entry(struct hidma_dev *dev, char *name, attrs = devm_kmalloc(dev->ddev.dev, sizeof(struct device_attribute), GFP_KERNEL); if (!attrs) - return -ENOMEM; + return NULL; name_copy = devm_kstrdup(dev->ddev.dev, name, GFP_KERNEL); if (!name_copy) - return -ENOMEM; + return NULL; attrs->attr.name = name_copy; attrs->attr.mode = mode; attrs->show = hidma_show_values; sysfs_attr_init(&attrs->attr); + return attrs; +} - return device_create_file(dev->ddev.dev, attrs); +static int hidma_sysfs_init(struct hidma_dev *dev) +{ + dev->chid_attrs = hidma_create_sysfs_entry(dev, "chid", S_IRUGO); + if (!dev->chid_attrs) + return -ENOMEM; + + return device_create_file(dev->ddev.dev, dev->chid_attrs); } + #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN static void hidma_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg) { @@ -823,7 +841,7 @@ static int hidma_probe(struct platform_device *pdev) dmadev->irq = chirq; tasklet_init(&dmadev->task, hidma_issue_task, (unsigned long)dmadev); hidma_debug_init(dmadev); - hidma_create_sysfs_entry(dmadev, "chid", S_IRUGO); + hidma_sysfs_init(dmadev); dev_info(&pdev->dev, "HI-DMA engine driver registration complete\n"); pm_runtime_mark_last_busy(dmadev->ddev.dev); pm_runtime_put_autosuspend(dmadev->ddev.dev); @@ -849,6 +867,7 @@ static int hidma_remove(struct platform_device *pdev) dma_async_device_unregister(&dmadev->ddev); devm_free_irq(dmadev->ddev.dev, dmadev->irq, dmadev->lldev); tasklet_kill(&dmadev->task); + hidma_sysfs_uninit(dmadev); hidma_debug_uninit(dmadev); hidma_ll_uninit(dmadev->lldev); hidma_free(dmadev); diff --git a/drivers/dma/qcom/hidma.h b/drivers/dma/qcom/hidma.h index 05f8ba4..c7d0142 100644 --- a/drivers/dma/qcom/hidma.h +++ b/drivers/dma/qcom/hidma.h @@ -130,6 +130,9 @@ struct hidma_dev { struct dentry *debugfs; struct dentry *stats; + /* sysfs entry for the channel id */ + struct device_attribute *chid_attrs; + /* Task delivering issue_pending */ struct tasklet_struct task; };