From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 211E5C433F5 for ; Tue, 18 Jan 2022 03:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=02hEoDLYCT7S6U5Mein9k5YIujmtTKB5IwXF+usDjuA=; b=zBfljc9TyxnamK FuKX6tuMG17wCcEmtpRwtuOrqwZL98sR3wpzfJY/2r0ldg+nPN6AQfo/jmyXBA5+06+zKYyZLOXxj UONaSNdAxzI7hIEf5Hynq3wohYmuvWkqmjPqfQMCWq6JseYUGLBq5rTXoX5ggep3wC599NULv5u/4 uk719FrjGKDL3Gn5P1/RC+WUiodrJUtBQZQL297NwPdWRdYePDleFKMKd5SQvO1QM9UgrIELDnj3O PqfjIgtuvpCTflrSjLQ1foD2LKjezbgqOeEFwEkblyrkeepDKasCueubHovpO4MTVTlZury6SEV9t C3Kps/xCMuNHVF/Pjiog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n9ejp-00HEtt-Um; Tue, 18 Jan 2022 03:00:49 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n9eN2-00H1Ju-NL; Tue, 18 Jan 2022 02:37:19 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 341A8B81229; Tue, 18 Jan 2022 02:37:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE24CC36AEF; Tue, 18 Jan 2022 02:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473434; bh=zDM+ojreXxp6aysR43uWqt69LDkwRD5ECLE0praKzMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bF48ybNkrbOMGlxV/LVUNuDiAHr9/RtFB68zKgcYDVqTqKnchPYV8HEx3a3nebhsH UW7NRdWw6K3VWiwohbbMSVaCVVezdTmVIyE8Q0btG0fr3L2Ox1PmlNwWQCqWBp4wlt ph4b5aMv4w+pnt2JdNakUX0hQCxIq69a9jHdLeSr5lg13ZQOkJ87Mhdlm7z3L1R4OE 8OLNztJaTj/jssdW509ht+a+MdKNPkdvQXNXE8Cg1Q65GBJG/0NkJzyGmyL/gmmUU/ wu9OyuJShZnbn7PjQhqS5zOOu451dTZtA++mbe+hcEmU1wnoWmS3XjGhoBYJth/EIa mddMpxvh1DtCA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikhail Rudenko , Ezequiel Garcia , Kieran Bingham , Mauro Carvalho Chehab , Sasha Levin , helen.koike@collabora.com, dafna.hirschfeld@collabora.com, mchehab@kernel.org, heiko@sntech.de, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 115/188] media: rockchip: rkisp1: use device name for debugfs subdir name Date: Mon, 17 Jan 2022 21:30:39 -0500 Message-Id: <20220118023152.1948105-115-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118023152.1948105-1-sashal@kernel.org> References: <20220118023152.1948105-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220117_183716_923747_26201AAC X-CRM114-Status: GOOD ( 13.46 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Mikhail Rudenko [ Upstream commit c2611e479f5d9b05108270e1ab423955486b4457 ] While testing Rockchip RK3399 with both ISPs enabled, a dmesg error was observed: ``` [ 15.559141] debugfs: Directory 'rkisp1' with parent '/' already present! ``` Fix it by using the device name for the debugfs subdirectory name instead of the driver name, thus preventing name collision. Link: https://lore.kernel.org/linux-media/20211010175457.438627-1-mike.rudenko@gmail.com Signed-off-by: Mikhail Rudenko Reviewed-by: Ezequiel Garcia Reviewed-by: Kieran Bingham Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index 7474150b94ed3..560f928c37520 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -426,7 +426,7 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1) { struct rkisp1_debug *debug = &rkisp1->debug; - debug->debugfs_dir = debugfs_create_dir(RKISP1_DRIVER_NAME, NULL); + debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL); debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir, &debug->data_loss); debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir, -- 2.34.1 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3BA74C433EF for ; Tue, 18 Jan 2022 03:01:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FcjgCErtFzRpAtmqTxzIuZuNIznT9aHo8fGLCzXScB8=; b=dIf+Fj40KUJvB9 tYTl6wkvYg3L8LjWekM3wX0vqHuMAP0c8Y4edHcvrsTLv3WhXTM1BvgHiJHJmm0Oo8M09AYHUqHvI mm3v4sj603GCcbLtHInK78iKF8uqjgqfIqRvGmMEB5CzGQoqjv3PpWYtjnjE8QHmk3Moaob8MhiS/ IaZVepud2gDqxvq7jdcoLa5M9Byh+RL+qrSkBGaFKo5xC8rYTSS+OmZh0Y1p7NxX9yTazEPo02xll aJJlNZpB9Zr/Vc2zofa5sslPMdLMfKXK3Bi2E5sQQlPpzyk2zJhcVsL2rUqRDNHjJAAxajA5T6RVw YXqzP/ytsxzKb7jSPQLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n9eiu-00HECm-9b; Tue, 18 Jan 2022 02:59:53 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n9eN2-00H1Ju-NL; Tue, 18 Jan 2022 02:37:19 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 341A8B81229; Tue, 18 Jan 2022 02:37:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE24CC36AEF; Tue, 18 Jan 2022 02:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473434; bh=zDM+ojreXxp6aysR43uWqt69LDkwRD5ECLE0praKzMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bF48ybNkrbOMGlxV/LVUNuDiAHr9/RtFB68zKgcYDVqTqKnchPYV8HEx3a3nebhsH UW7NRdWw6K3VWiwohbbMSVaCVVezdTmVIyE8Q0btG0fr3L2Ox1PmlNwWQCqWBp4wlt ph4b5aMv4w+pnt2JdNakUX0hQCxIq69a9jHdLeSr5lg13ZQOkJ87Mhdlm7z3L1R4OE 8OLNztJaTj/jssdW509ht+a+MdKNPkdvQXNXE8Cg1Q65GBJG/0NkJzyGmyL/gmmUU/ wu9OyuJShZnbn7PjQhqS5zOOu451dTZtA++mbe+hcEmU1wnoWmS3XjGhoBYJth/EIa mddMpxvh1DtCA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikhail Rudenko , Ezequiel Garcia , Kieran Bingham , Mauro Carvalho Chehab , Sasha Levin , helen.koike@collabora.com, dafna.hirschfeld@collabora.com, mchehab@kernel.org, heiko@sntech.de, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 115/188] media: rockchip: rkisp1: use device name for debugfs subdir name Date: Mon, 17 Jan 2022 21:30:39 -0500 Message-Id: <20220118023152.1948105-115-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118023152.1948105-1-sashal@kernel.org> References: <20220118023152.1948105-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220117_183716_923747_26201AAC X-CRM114-Status: GOOD ( 13.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mikhail Rudenko [ Upstream commit c2611e479f5d9b05108270e1ab423955486b4457 ] While testing Rockchip RK3399 with both ISPs enabled, a dmesg error was observed: ``` [ 15.559141] debugfs: Directory 'rkisp1' with parent '/' already present! ``` Fix it by using the device name for the debugfs subdirectory name instead of the driver name, thus preventing name collision. Link: https://lore.kernel.org/linux-media/20211010175457.438627-1-mike.rudenko@gmail.com Signed-off-by: Mikhail Rudenko Reviewed-by: Ezequiel Garcia Reviewed-by: Kieran Bingham Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index 7474150b94ed3..560f928c37520 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -426,7 +426,7 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1) { struct rkisp1_debug *debug = &rkisp1->debug; - debug->debugfs_dir = debugfs_create_dir(RKISP1_DRIVER_NAME, NULL); + debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL); debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir, &debug->data_loss); debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir, -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A917C433FE for ; Tue, 18 Jan 2022 02:47:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344346AbiARCr5 (ORCPT ); Mon, 17 Jan 2022 21:47:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347871AbiARCnT (ORCPT ); Mon, 17 Jan 2022 21:43:19 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EB31C06135C; Mon, 17 Jan 2022 18:37:16 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5657CB811CF; Tue, 18 Jan 2022 02:37:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE24CC36AEF; Tue, 18 Jan 2022 02:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473434; bh=zDM+ojreXxp6aysR43uWqt69LDkwRD5ECLE0praKzMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bF48ybNkrbOMGlxV/LVUNuDiAHr9/RtFB68zKgcYDVqTqKnchPYV8HEx3a3nebhsH UW7NRdWw6K3VWiwohbbMSVaCVVezdTmVIyE8Q0btG0fr3L2Ox1PmlNwWQCqWBp4wlt ph4b5aMv4w+pnt2JdNakUX0hQCxIq69a9jHdLeSr5lg13ZQOkJ87Mhdlm7z3L1R4OE 8OLNztJaTj/jssdW509ht+a+MdKNPkdvQXNXE8Cg1Q65GBJG/0NkJzyGmyL/gmmUU/ wu9OyuJShZnbn7PjQhqS5zOOu451dTZtA++mbe+hcEmU1wnoWmS3XjGhoBYJth/EIa mddMpxvh1DtCA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikhail Rudenko , Ezequiel Garcia , Kieran Bingham , Mauro Carvalho Chehab , Sasha Levin , helen.koike@collabora.com, dafna.hirschfeld@collabora.com, mchehab@kernel.org, heiko@sntech.de, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 115/188] media: rockchip: rkisp1: use device name for debugfs subdir name Date: Mon, 17 Jan 2022 21:30:39 -0500 Message-Id: <20220118023152.1948105-115-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118023152.1948105-1-sashal@kernel.org> References: <20220118023152.1948105-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Mikhail Rudenko [ Upstream commit c2611e479f5d9b05108270e1ab423955486b4457 ] While testing Rockchip RK3399 with both ISPs enabled, a dmesg error was observed: ``` [ 15.559141] debugfs: Directory 'rkisp1' with parent '/' already present! ``` Fix it by using the device name for the debugfs subdirectory name instead of the driver name, thus preventing name collision. Link: https://lore.kernel.org/linux-media/20211010175457.438627-1-mike.rudenko@gmail.com Signed-off-by: Mikhail Rudenko Reviewed-by: Ezequiel Garcia Reviewed-by: Kieran Bingham Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index 7474150b94ed3..560f928c37520 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -426,7 +426,7 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1) { struct rkisp1_debug *debug = &rkisp1->debug; - debug->debugfs_dir = debugfs_create_dir(RKISP1_DRIVER_NAME, NULL); + debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL); debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir, &debug->data_loss); debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir, -- 2.34.1