Received: by 2002:a05:6622:f08:0:0:0:0 with SMTP id l8csp4490291ivc; Tue, 3 Nov 2020 13:25:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXG0zFoeykbmZTg7OpK8yLFHHiPFV8+dpN58qroj91T4XrBS7wZxAJFMT11dLEnHRcYBWE X-Received: by 2002:aa7:c2c4:: with SMTP id m4mr15232750edp.66.1604438744819; Tue, 03 Nov 2020 13:25:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604438744; cv=none; d=google.com; s=arc-20160816; b=juDBU+m+ffgc94t6oQ93Bt10l/JiJGj6OzSag+e+bZopHkpniGHi8C2ryyH/n4Q7Q8 qjW6pT2Ys9FmpfhtEKo0np17juLOV/bEchq2Bmqj40Er0/iZMTPynIWutcZMnNJumbLI 80LokUksqH62xq6GBMooZjabrdNZGBNDymRsK8sZvbGOSFO6DJX3E+Vg0mIWUJq48prg Nm/U+x6uojBlD86MJnNtSHeKvgq6XK+yv1SaXe7JYw8NDJ6sF2KUf+eriKwoB13xC6Bt ic/g4xBcKXJbb4ByRFWlt44P/WrGsad6p7Dy33bGUUUi1nUSEhGHthnfitAL6oRaWcB2 CXog== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5X2GaoBLOdBeu5e5GR1GcUuKxj3kbjiCZyKf+NbKq1I=; b=EtO/30zKAo7SfqAWD9WUQDNxrH9k3DXONmPcU4A3ix/WrPb2Tca1jenEy16DPK5YZ9 HgrYfv/10GcU7rUGaiaOb4ujs6nV4YjcZegTy8LVRlRJ4ahdZAa+qhI5SnGVuQ3Fgtqn 0FYVTeOQy12xtTSQODtUNiiOUzfGTG5Jz8AqpsK1jD/9MKUZjCUDPIH4RfBuUDGt6aKE C//blpwFG8j+fafayl6CS8TDi1kcl1vQ62fylTjXkF8V2gV7CEryaiQWltgP33gVHoVQ taQGe2B7OOmf9uR6qnFitwUbVzP8uVhW51pbM6QrJNEef1sOcraFAm65S7f18pYTs6Lk r4xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f2dpNcQD; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a2si7694303edn.504.2020.11.03.13.25.21; Tue, 03 Nov 2020 13:25: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=default header.b=f2dpNcQD; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387706AbgKCVWs (ORCPT + 99 others); Tue, 3 Nov 2020 16:22:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:43470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733040AbgKCVFF (ORCPT ); Tue, 3 Nov 2020 16:05:05 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8489B21534; Tue, 3 Nov 2020 21:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437505; bh=39fFgJmmKNCxoiW6ZAWyEeNi/V8uC9EXxrdZQn29XSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f2dpNcQDPUwuV8Tpx28xaqYp+/yeDFRDXBUeDUHIUMjdr3dM+ASUsKkEbajPVdDrE O+s+TRY02E3cGEo5obgfDkc3mUJvbnQAivCf4PwmJRryNQSn4M4FnM7Wd8VmMJplHN l9kfsR8KZBuimC8ftA4hbY4vCBVJjcn8wak6nUeg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Santosh Shilimkar , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 4.19 105/191] memory: emif: Remove bogus debugfs error handling Date: Tue, 3 Nov 2020 21:36:37 +0100 Message-Id: <20201103203243.447026264@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit fd22781648080cc400772b3c68aa6b059d2d5420 ] Callers are generally not supposed to check the return values from debugfs functions. Debugfs functions never return NULL so this error handling will never trigger. (Historically debugfs functions used to return a mix of NULL and error pointers but it was eventually deemed too complicated for something which wasn't intended to be used in normal situations). Delete all the error handling. Signed-off-by: Dan Carpenter Acked-by: Santosh Shilimkar Link: https://lore.kernel.org/r/20200826113759.GF393664@mwanda Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- drivers/memory/emif.c | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index 2f214440008c3..1c6b2cc6269ad 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -165,35 +165,12 @@ static const struct file_operations emif_mr4_fops = { static int __init_or_module emif_debugfs_init(struct emif_data *emif) { - struct dentry *dentry; - int ret; - - dentry = debugfs_create_dir(dev_name(emif->dev), NULL); - if (!dentry) { - ret = -ENOMEM; - goto err0; - } - emif->debugfs_root = dentry; - - dentry = debugfs_create_file("regcache_dump", S_IRUGO, - emif->debugfs_root, emif, &emif_regdump_fops); - if (!dentry) { - ret = -ENOMEM; - goto err1; - } - - dentry = debugfs_create_file("mr4", S_IRUGO, - emif->debugfs_root, emif, &emif_mr4_fops); - if (!dentry) { - ret = -ENOMEM; - goto err1; - } - + emif->debugfs_root = debugfs_create_dir(dev_name(emif->dev), NULL); + debugfs_create_file("regcache_dump", S_IRUGO, emif->debugfs_root, emif, + &emif_regdump_fops); + debugfs_create_file("mr4", S_IRUGO, emif->debugfs_root, emif, + &emif_mr4_fops); return 0; -err1: - debugfs_remove_recursive(emif->debugfs_root); -err0: - return ret; } static void __exit emif_debugfs_exit(struct emif_data *emif) -- 2.27.0