From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-180.mta1.migadu.com (out-180.mta1.migadu.com [95.215.58.180]) (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 BF9E2823AF for ; Thu, 23 May 2024 20:18:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716495535; cv=none; b=CH7So7+0fV5bUJDSo0Ij13TpoiZuE0FAzo4oZQetYahScFpYhaE8+oB2ZZBIgpNUOcRvQ6FW8IXTpT242i2mYPePp4sJlPo5eIv+1hjPXBZ6MyYvceP9JJ+2X4XP6XPhA+Ef87nbakGA/WUNdZecIRF7WmRxUhjrwK7YJONgpm8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716495535; c=relaxed/simple; bh=/MnKLO3shXWEZFBIMAsNwFyC317yrwWObfqwNCUloow=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=hNLKkNdhijCEkyPhE8cPJquB0dmP4LaY5p8EoQWN6wDLhvADjG81vMJgOVSF3Y/jnKhdcaFyArh3a47NeXS/hXqOEwZnFrlzHYsURTg1aYUTvitlP64swVenhmrb98vlQZ/a//aucNLSQdz0kn6JJwyjXnX+uydJjDHu2WjKNRo= 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=gaTRJS5V; arc=none smtp.client-ip=95.215.58.180 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="gaTRJS5V" X-Envelope-To: markus.elfring@web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716495529; 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=b6Wt/yr5KVLoM5TaMmIZdJgpIFHqeGyswfXtkHFJYik=; b=gaTRJS5V2i8CsvTKTxwRH7Eml035EyZJldaxir3Sy+sotgCbBJPtXmN/qy9ArbajrCZDTT JOBGcTzNEuizdoJjis4+R4rfFC2+2MVjzOGuQokAaLayUNBE4c+kNtnozpyW7q24rOveS4 lOld6QJrNva6uNYLTJQSyuQdjTJv25g= 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 16:18:42 -0400 Precedence: bulk X-Mailing-List: linux-kernel@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: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT On 5/23/24 16:11, Markus Elfring wrote: >>> … >>>> +++ 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: >> ... > > This design variant can also be reasonable. > > Do any preferences matter here for label name selections? Personally, I prefer to use labels named after what they're cleaning up and not what they're doing. --Sean