From patchwork Mon Oct 21 16:21:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 177100 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3635125ill; Mon, 21 Oct 2019 09:25:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqxhUN97gMfJDnH3Wg9TGl9mNt3WAEq/iPwiLt2iG7Kc3DzlfSxfXTjrxW+SAzn4DGBpON4A X-Received: by 2002:a17:906:1e07:: with SMTP id g7mr23366674ejj.256.1571675131519; Mon, 21 Oct 2019 09:25:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571675131; cv=none; d=google.com; s=arc-20160816; b=Yr2qAhrWq1CnmZClAovnnVtgzWKSbVFcqUo85Mo54kB8NPpSATxUSmQYIqy7VCxF/S rMOY3DiU8NhtzkFuvCI2H4gUaDBsd2CmPNFCzI/MwdZ3D/rhHQGq8BRk0RNOMFINYpTG NtaFC+hySdfrChKVsUOJR3/7JdjARmh0in5b24KrlCVoc+JUazqmeeRa+VS0hIFdeGMC JhxHbsADVPdXYL0WvzrPpLCR5r2Sj+vhoA6PwYNS59DENJryxcbzKXlxDdyiDai6uq6x E1QMITgjKvLta+ROHuAnKdTCmcePRTZcO1DSk2Yzttl/G28TTZR40mRzrWh6G3w8rWDU DkOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=VJJL3xs/6g0bK4RXbpkW4vc2jd+96e5BsQ/l6BLVJG0=; b=qzeO8XRP62BfdHTOyl/DXeDDaLu/KSY4ErEec6LGbCnSgRarsbKXTjQJZ8EWwpx/jo oT7ibtLEYZsvuQXxgjOxfe0AzfcLJYkMEFnNAO0qyzjdqL5Jo7VygDIQV2WcrUYpjQGN LjPqxOviyHuH6IAe0N9Vami9eOEm+4Fad1rS9wC9dVNGTdog2Qr9APzT49WmHazo2J8U 3NwuulqFU0pfUkukr72H9RuuKes2CRX/NrKFFgiYHhw01xYrkFhjzBqXjamX13laEApD BdvY409ALM05j7sYHRJh4V9jwnT/qT0+JNH7C5u7fycT8jiuevDdQyNoz+THlfc9akPl l74g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w43si10892760edd.332.2019.10.21.09.25.31; Mon, 21 Oct 2019 09:25:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728547AbfJUQZ1 (ORCPT + 26 others); Mon, 21 Oct 2019 12:25:27 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:33122 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727303AbfJUQZ1 (ORCPT ); Mon, 21 Oct 2019 12:25:27 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id F056D2AD5D5169600816; Tue, 22 Oct 2019 00:25:24 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.439.0; Tue, 22 Oct 2019 00:25:16 +0800 From: John Garry To: , CC: , , , Xiang Chen , "John Garry" Subject: [PATCH 01/18] scsi: hisi_sas: Don't create debugfs dump folder twice Date: Tue, 22 Oct 2019 00:21:58 +0800 Message-ID: <1571674935-108326-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1571674935-108326-1-git-send-email-john.garry@huawei.com> References: <1571674935-108326-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiang Chen Due to a merge error, we attempt to create 2x debugfs dump folders, which fails: [ 861.101914] debugfs: Directory 'dump' with parent '0000:74:02.0' already present! This breaks the dump function. To fix, remove the superfluous attempt to create the folder. Fixes: 7ec7082c57ec ("scsi: hisi_sas: Add hisi_sas_debugfs_alloc() to centralise allocation") Signed-off-by: Xiang Chen Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_main.c | 3 --- 1 file changed, 3 deletions(-) -- 2.17.1 diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 1a25f0f15fd0..ceba1016b77f 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -3712,9 +3712,6 @@ static int hisi_sas_debugfs_alloc(struct hisi_hba *hisi_hba) int p, c, d; size_t sz; - hisi_hba->debugfs_dump_dentry = - debugfs_create_dir("dump", hisi_hba->debugfs_dir); - sz = hw->debugfs_reg_array[DEBUGFS_GLOBAL]->count * 4; hisi_hba->debugfs_regs[DEBUGFS_GLOBAL] = devm_kmalloc(dev, sz, GFP_KERNEL);