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 A9239171671; Tue, 10 Sep 2024 09:55:19 +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=1725962119; cv=none; b=i843JSV9qItq4wlaoWcUeR8i3xBHD4i5VBC8w128cVGBsifAiZlXas6LBOwqEYm3Ps7dKAp37H/SjkMAEtPU6xFQrQllDuWlVPc9Spb2pTmh+mBX+wC22ttXXhXXfE+b+2awA0gLCfheN4SahUt5Pa0Mr34j14TXTA3vvbI7Bek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962119; c=relaxed/simple; bh=HqmrULg8Cz+NyFP8/7yEvuR3uIbp+yQHpGfYEm2x5/c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BwhcO9ha/+l0COYRMvt85fCMjD1bToB6koHcUffr8XUplOcv9bbKaX2CZ9il7SaCjN2U9dEFiCIycOtbgXMuQJfkce1jlnVFRJCpg51yBmCUCRoxXhKj2yZc2dsZr6tLB3id87uMbGE5TO0PH9gIvTj/fwTT6yHuaXccvmtl1f0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fekjROsv; 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="fekjROsv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 311DBC4CEC3; Tue, 10 Sep 2024 09:55:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725962119; bh=HqmrULg8Cz+NyFP8/7yEvuR3uIbp+yQHpGfYEm2x5/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fekjROsv+ECBmrZrj+BjOp3zMn7J6x5QzW93D90p++n2FtwZwIz8TtrO2T+jm+H9p UXfJ2ThSf5Oy9nK08rOuKS4zThplUej6LwA8SWdz16J/CYBZRP1u0IKZ3sWhPBzjPT iZWpKDQGf+5ULCpaAFMzWQeiMJzm68HJThNkTopM= 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.10 301/375] nvmem: Fix return type of devm_nvmem_device_get() in kerneldoc Date: Tue, 10 Sep 2024 11:31:38 +0200 Message-ID: <20240910092632.667872348@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092622.245959861@linuxfoundation.org> References: <20240910092622.245959861@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-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 @@ -1258,13 +1258,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)