{"id":1936167,"url":"http://patchwork.ozlabs.org/api/patches/1936167/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-aspeed/patch/20240516181907.3468796-17-eajames@linux.ibm.com/","project":{"id":57,"url":"http://patchwork.ozlabs.org/api/projects/57/?format=json","name":"Linux ASPEED SoC development","link_name":"linux-aspeed","list_id":"linux-aspeed.lists.ozlabs.org","list_email":"linux-aspeed@lists.ozlabs.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20240516181907.3468796-17-eajames@linux.ibm.com>","list_archive_url":null,"date":"2024-05-16T18:18:43","name":"[v3,16/40] fsi: aspeed: Remove cfam reset sysfs file in error path and remove","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ad5ebac1d583d6e6c0a212699ba78ee7242ec0db","submitter":{"id":74989,"url":"http://patchwork.ozlabs.org/api/people/74989/?format=json","name":"Eddie James","email":"eajames@linux.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-aspeed/patch/20240516181907.3468796-17-eajames@linux.ibm.com/mbox/","series":[{"id":407101,"url":"http://patchwork.ozlabs.org/api/series/407101/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-aspeed/list/?series=407101","date":"2024-05-16T18:18:31","name":"fsi: Add interrupt support","version":3,"mbox":"http://patchwork.ozlabs.org/series/407101/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1936167/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1936167/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=MvNsBT5v;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=MvNsBT5v;\n\tdkim-atps=neutral","lists.ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=linux.ibm.com","lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=MvNsBT5v;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com\n (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com;\n envelope-from=eajames@linux.ibm.com; receiver=lists.ozlabs.org)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (secp384r1))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4VgJMw585dz1yfq\n\tfor ; Fri, 17 May 2024 04:22:04 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4VgJMw2vVpz3fqM\n\tfor ; Fri, 17 May 2024 04:22:04 +1000 (AEST)","from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com\n [148.163.158.5])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4VgJK92J3Rz3frp;\n\tFri, 17 May 2024 04:19:41 +1000 (AEST)","from pps.filterd (m0353725.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GEwVq5032671;\n\tThu, 16 May 2024 18:19:16 GMT","from ppma21.wdc07v.mail.ibm.com\n (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91])\n\tby mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3y5mce8frm-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:15 +0000","from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1])\n\tby ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GHjhb4002298;\n\tThu, 16 May 2024 18:19:15 GMT","from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72])\n\tby ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3y2m0pkfue-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:15 +0000","from smtpav05.dal12v.mail.ibm.com (smtpav05.dal12v.mail.ibm.com\n [10.241.53.104])\n\tby smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 44GIJCuP8848072\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n\tThu, 16 May 2024 18:19:14 GMT","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 6828E5807D;\n\tThu, 16 May 2024 18:19:12 +0000 (GMT)","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 28E5058089;\n\tThu, 16 May 2024 18:19:12 +0000 (GMT)","from slate16.aus.stglabs.ibm.com (unknown [9.61.107.19])\n\tby smtpav05.dal12v.mail.ibm.com (Postfix) with ESMTP;\n\tThu, 16 May 2024 18:19:12 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com;\n h=from : to : cc : subject\n : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding; s=pp1;\n bh=lFmEKEVqDlmQndwRBXHA+wm3UdLuPoyhnFJMvDQ5EkU=;\n b=MvNsBT5vEe7MSO5wi1MdPYMqZ++n13qE95FpPL1fN/OkDXprnxArOH+1DVgbnzidlH4K\n sD+SYbxrGDSqUoeGaHlQJ+RiGcNwUrEsywdngVzDXb9s8dqa/pmrnPNYJbi0GwuUnOHT\n /3HzsORWg6gri9QvT3eY7kzZLwpr2xAYib9bfcK/HPD36WlNHnsPB371BpXsylIwehEo\n 86XYPtcocCTdFXeZ0E8FlSttDS29zaj7mD20DVYfwgzud3TzZhkJqDtzWHg+KtVo4N5V\n NIe3koyMa+3dd9XlwiSofeQ9fWAQvi5xmWnUgLdC8N1zCln/cF+Qtt3BME3YlNasWT0i Yg==","From":"Eddie James ","To":"linux-fsi@lists.ozlabs.org","Subject":"[PATCH v3 16/40] fsi: aspeed: Remove cfam reset sysfs file in error\n path and remove","Date":"Thu, 16 May 2024 13:18:43 -0500","Message-Id":"<20240516181907.3468796-17-eajames@linux.ibm.com>","X-Mailer":"git-send-email 2.39.3","In-Reply-To":"<20240516181907.3468796-1-eajames@linux.ibm.com>","References":"<20240516181907.3468796-1-eajames@linux.ibm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-TM-AS-GCONF":"00","X-Proofpoint-GUID":"0rRQTlx8XMLnnahiLPxS5tdfOSsLnClr","X-Proofpoint-ORIG-GUID":"0rRQTlx8XMLnnahiLPxS5tdfOSsLnClr","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26\n definitions=2024-05-16_07,2024-05-15_01,2023-05-22_02","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n mlxlogscore=935 phishscore=0\n adultscore=0 priorityscore=1501 malwarescore=0 suspectscore=0 bulkscore=0\n mlxscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 clxscore=1015\n classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000\n definitions=main-2405160132","X-BeenThere":"linux-aspeed@lists.ozlabs.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux ASPEED SoC development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"andi.shyti@kernel.org, linux-aspeed@lists.ozlabs.org, jk@ozlabs.org,\n alistair@popple.id.au, linux-kernel@vger.kernel.org,\n linux-spi@vger.kernel.org, broonie@kernel.org, andrew@codeconstruct.com.au,\n linux-i2c@vger.kernel.org","Errors-To":"linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org","Sender":"\"Linux-aspeed\"\n "},"content":"This fixes a duplicate sysfs warning on device re-probe.\n\nFixes: 4a851d714ead (\"fsi: aspeed: Support CFAM reset GPIO\")\nSigned-off-by: Eddie James \n---\n drivers/fsi/fsi-master-aspeed.c | 7 +++++++\n 1 file changed, 7 insertions(+)","diff":"diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c\nindex a67f185bb8814..29932037c9866 100644\n--- a/drivers/fsi/fsi-master-aspeed.c\n+++ b/drivers/fsi/fsi-master-aspeed.c\n@@ -437,6 +437,7 @@ static int setup_cfam_reset(struct fsi_master_aspeed *aspeed)\n \n \trc = device_create_file(dev, &dev_attr_cfam_reset);\n \tif (rc) {\n+\t\taspeed->cfam_reset_gpio = NULL;\n \t\tdevm_gpiod_put(dev, gpio);\n \t\treturn rc;\n \t}\n@@ -615,6 +616,9 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev)\n err_regmap:\n \tregmap_exit(aspeed->master.map);\n err_release:\n+\tif (aspeed->cfam_reset_gpio)\n+\t\tdevice_remove_file(aspeed->dev, &dev_attr_cfam_reset);\n+\n \tclk_disable_unprepare(aspeed->clk);\n err_free_aspeed:\n \tkfree(aspeed);\n@@ -625,6 +629,9 @@ static int fsi_master_aspeed_remove(struct platform_device *pdev)\n {\n \tstruct fsi_master_aspeed *aspeed = platform_get_drvdata(pdev);\n \n+\tif (aspeed->cfam_reset_gpio)\n+\t\tdevice_remove_file(aspeed->dev, &dev_attr_cfam_reset);\n+\n \tfsi_master_unregister(&aspeed->master);\n \tclk_disable_unprepare(aspeed->clk);\n \n","prefixes":["v3","16/40"]}