From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9960E18A6D2; Tue, 10 Sep 2024 10:12:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725963124; cv=none; b=gMokDCDunRxwXSv10R01oogWjwRMmrbzivTdBHLwRDfvg90iddSHZnlbwu3OLLIqBwdCFoGhlRVBUJjuRx9+VuI+AYVfFYkh4H/lwFSZKgs5PZFZmgk7n0ALkoEXvylAr16rta/HDVAciYzuTK6jllVCF/eP+vAjbLd3RsBIUnw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725963124; c=relaxed/simple; bh=34h3zAawToUvW9+JZmU6g31kUkNQvF3FtpZ3BiRuYwA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JlIHJqffGwv3GMEmmwV5/pyCR9oi4xfPbyM4k9k0s2aXNxnwFTXDptnnXdl+A8F+qaly8V6c2rK2w+fgg9x/PaI1CPE80oeALTIk5ynwCWKhw7C26ZrQf3dO3bdAeCtxJ4UY9QhxoVW6aN/r2+lL1AE45lG9E3zig85v4q/p4Yk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hG9A2laq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hG9A2laq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B01FC4CEC3; Tue, 10 Sep 2024 10:12:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725963124; bh=34h3zAawToUvW9+JZmU6g31kUkNQvF3FtpZ3BiRuYwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hG9A2laqmef4xtTg+ue/guR/C6TdMwWr+PGJLurZqtk8wnE1NZrjRKylVGNTvyt2W 0y9qQkF3xsSX26q1uB4CoUXKbBS8S1AzTixtYAr88GMsCgnCsjeViv+k+zRL3HJFz6 BPMgG7g8Wcn1/HiuHQ9JmoBsxvsrH6tWz3+6OkZw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Geert Uytterhoeven , Srinivas Kandagatla Subject: [PATCH 6.1 144/192] nvmem: Fix return type of devm_nvmem_device_get() in kerneldoc Date: Tue, 10 Sep 2024 11:32:48 +0200 Message-ID: <20240910092603.904698345@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092557.876094467@linuxfoundation.org> References: <20240910092557.876094467@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Geert Uytterhoeven commit c69f37f6559a8948d70badd2b179db7714dedd62 upstream. devm_nvmem_device_get() returns an nvmem device, not an nvmem cell. Fixes: e2a5402ec7c6d044 ("nvmem: Add nvmem_device based consumer apis.") Cc: stable Signed-off-by: Geert Uytterhoeven Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20240902142510.71096-3-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/nvmem/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1092,13 +1092,13 @@ void nvmem_device_put(struct nvmem_devic EXPORT_SYMBOL_GPL(nvmem_device_put); /** - * devm_nvmem_device_get() - Get nvmem cell of device form a given id + * devm_nvmem_device_get() - Get nvmem device of device form a given id * * @dev: Device that requests the nvmem device. * @id: name id for the requested nvmem device. * - * Return: ERR_PTR() on error or a valid pointer to a struct nvmem_cell - * on success. The nvmem_cell will be freed by the automatically once the + * Return: ERR_PTR() on error or a valid pointer to a struct nvmem_device + * on success. The nvmem_device will be freed by the automatically once the * device is freed. */ struct nvmem_device *devm_nvmem_device_get(struct device *dev, const char *id)