From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com [95.215.58.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1493EC7 for ; Thu, 23 May 2024 19:21:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716492119; cv=none; b=oy//x5QT3AQUEaErFSvnH7QDIe5UP3iN3AdnzE6y3Uhwv/Yu9x2XHX1MKqSjjUaUd/Fx/357t4n8N7Xq15p9rnrFfzq8OXWRbYmqzaxlC0DlCHb7J2XkQFxx1JDnTA5isRbj4fae/4YoKR6H8ZRnU3cEaYEMeB5rE/WtGhQ1JNQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716492119; c=relaxed/simple; bh=25mrLq4UvC0JErHjDuS4X9W9wdyENwq5Smnn3Kaw0kE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=a4j/rOXVb0uUCSL3M8IPEG/xDcQwSsyPDfIsr8jt5H8iMc16L4iuTJ2UYT4g2eidm8K98zrk1VxSme9lhOsRs0Gfo+nMBx+0uMzXRyKOqnX9WN04MADtTau2AUzBsYy/JaSaQNEuF0qwp8CyGWjHHr8Gsb4vsPNk7iTEqGr9bok= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=vnTX0/Cf; arc=none smtp.client-ip=95.215.58.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="vnTX0/Cf" X-Envelope-To: markus.elfring@web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716492114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WzX5A5SYPlpB7RwukIY2e9k3aUFWdFp/hlgqPag14Us=; b=vnTX0/CfpQCPagjo016On7vSi/hVR85K2yQVOo+kUwULXO4l9MXFhPF7rSDbmtAbElptlb f9YWyZh55NSi7U6owtU3NemUwYbHwtxCDSXOoLgWfnKfrT0Rj9j/0UMFUlxTRQjrqWNOcs /jrUFZHR0K7vt0A+6BgLzR21uS39PpA= X-Envelope-To: linux-arm-kernel@lists.infradead.org X-Envelope-To: linux-pci@vger.kernel.org X-Envelope-To: kw@linux.com X-Envelope-To: lpieralisi@kernel.org X-Envelope-To: robh@kernel.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: bharat.kumar.gogada@xilinx.com X-Envelope-To: bhelgaas@google.com X-Envelope-To: lorenzo.pieralisi@arm.com X-Envelope-To: michal.simek@amd.com X-Envelope-To: michal.simek@xilinx.com X-Envelope-To: thippeswamy.havalige@amd.com Message-ID: Date: Thu, 23 May 2024 15:21:48 -0400 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH v3 5/7] PCI: xilinx-nwl: Clean up clock on probe failure/removal To: Markus Elfring , linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= , Lorenzo Pieralisi , Rob Herring Cc: LKML , Bharat Kumar Gogada , Bjorn Helgaas , Lorenzo Pieralisi , Michal Simek , Michal Simek , Thippeswamy Havalige References: <20240520145402.2526481-6-sean.anderson@linux.dev> <4a43cda4-dfa4-4156-b616-75e740f6fd64@web.de> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Sean Anderson In-Reply-To: <4a43cda4-dfa4-4156-b616-75e740f6fd64@web.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT On 5/23/24 15:18, Markus Elfring wrote: >> Make sure we turn off the clock on probe failure and device removal. > … >> +++ b/drivers/pci/controller/pcie-xilinx-nwl.c > … >> @@ -817,11 +818,23 @@ static int nwl_pcie_probe(struct platform_device *pdev) >> err = nwl_pcie_enable_msi(pcie); >> if (err < 0) { >> dev_err(dev, "failed to enable MSI support: %d\n", err); >> - return err; >> + goto err_clk; >> } >> } >> >> - return pci_host_probe(bridge); >> + err = pci_host_probe(bridge); >> + >> +err_clk: >> + if (err) >> + clk_disable_unprepare(pcie->clk); > > I suggest to use the label “disable_unprepare_clock” directly before this function call > (in the if branch) so that a duplicate check would be avoided after some error cases. Well if you want to avoid a check, we can just do err = pci_host_probe(bridge); if (!err) return 0; err_clk: ... --Sean