Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3386776pxb; Mon, 17 Jan 2022 19:18:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4VA0CwZ9yad6n4jjDs6WyDo/i9h0pMjjISCm11K1lC2ZCAYFt25Mu1SOlXZU/mpb9EeP1 X-Received: by 2002:a17:902:70c7:b0:149:d966:789d with SMTP id l7-20020a17090270c700b00149d966789dmr25839896plt.164.1642475924859; Mon, 17 Jan 2022 19:18:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642475924; cv=none; d=google.com; s=arc-20160816; b=T/cNVnyHo/xHvN9aVun9Wi37RytZ4ANo92cYj5YFWdAgRXTRHslrvZdpz0nqWnXTgC ZYo8sFZzEGwz8lzJDkYBilRCZ10thX17GC0NE2Ut7Y4Iw3EupLRAKvBl0txHdXb7yjxc Ay0Mq9Ezh1NsZseodz6li5C2to7W2tC6pal9im09a4iVLhr0A/9Ps51qVHqMawAdyS+y g74CzXark0sUF5efVWk8+ehkatsksMP31EEv2bIal3/txHq/WAfdkfzwi7e45Y9H7k+q Sct6X7VC6kVtjtohSanmhpsevIfL8FRla736kBQboq9KeRdmkwH92rgaCmQ4tMfFOpVT mZCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=F6vvjv6ihaZsi4z/ywsss+uVR51lgyE5N8LuMaTW1WU=; b=ERnJ6ihk9W+B6G4BIaqaKMFgDLImSin7jnaN7/KfJjSxCyr15tKL9dHb5SMYpsd62c nvwqwRvRbIndVxaufMspb7m8NTao1t82hSLJINPovMYe6Ah9o6+1FXIP570KUz2bMxJv sQerRebUldc7EXnDTC1goTNUycPLgC5789aPaBthjmQiI5zDfYUpsKk7O+h6GzNDu8qm DDx0aVuYDtaooUXjNzoHTM+QfMvLbGH5x5gfy6kqevZHvFFFyErrHOE0kPSDu7cACWiJ Hz3p/y2vof9XGqPA6iC5naKbFwisLeAmzFWFInkkUMRgL3xVyZkv8jLkVOS8hFAy5A8v O4ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uHP7lZyb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p12si14525168plr.469.2022.01.17.19.18.29; Mon, 17 Jan 2022 19:18:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uHP7lZyb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245612AbiARC2x (ORCPT + 99 others); Mon, 17 Jan 2022 21:28:53 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:43796 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244676AbiARC0g (ORCPT ); Mon, 17 Jan 2022 21:26:36 -0500 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 dfw.source.kernel.org (Postfix) with ESMTPS id C279261157; Tue, 18 Jan 2022 02:26:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDA35C36AEF; Tue, 18 Jan 2022 02:26:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642472795; bh=s1+wA1K07F5Sne0E08ebjE9IXHWGC4ncgOKASX8xlfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uHP7lZybTGN9ygG6xWy+Df3c6i686PG/BPlv5ppxOB28B3BN3CqBFGk3YsBP1Xqrc jg0Aw//CHR/x0eyVKh2yvyk9dpdFIa6cEOU5+LHtW/f36/FyRoFLz78lyC10CNdrCj kA4fl903hOHVkfav7EGrUaToxFY9wwZW7N24FA0Y0GIFkdwfrnU7bYLqLqkhDl5pHd lYQVHY8XTu0CJaT1nLQ8jK7Pfk1rBvbOqLxwzatO29GIh/VxMsX/YFNC9TY5J8oaT+ HOo8TkcXtVJMH1B79NAz4ZaeyXRNIOLwSlbNLwHXMaH1vUCOVV97FT37urSjrw3Wn/ xhBLNRkKbJ9ww== 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.16 135/217] media: rockchip: rkisp1: use device name for debugfs subdir name Date: Mon, 17 Jan 2022 21:18:18 -0500 Message-Id: <20220118021940.1942199-135-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118021940.1942199-1-sashal@kernel.org> References: <20220118021940.1942199-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-kernel@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 50b166c49a03a..3f5cfa7eb9372 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -462,7 +462,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