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 6F0F31DDCE; Tue, 16 Jul 2024 15:50:50 +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=1721145050; cv=none; b=bgLMTx2gBUK9C1CtR5RjpMqbQ9tGYFKRNd92INQwqGd9emW2XFCD93Uux0aLcFgyPZRWAXgzBoGRX4TefzXYcsEaLTcdGpKlMA1LZJAcEteKAyo2udJyFDQCmENuh92nEqJbQCPIK9RMRMCsT9aL+i880emRT+k5cvNYryY5tLI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721145050; c=relaxed/simple; bh=OgxTHOGAzB/xc7Mzf0HZRTolpVHRtB0yGjpSwmtgwF8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kvYY+V/BbXCcWk92NMasmWWwdU4rPaipmP8X2pMU1qq0f3uM0UvmaogoY8CHu1qUgQ2Dv/UsOYd2331tsLnS5C1yOxwfUYYvaHij2ZpffcNG1UPlcj9O0Sy6Z4B7Dbt5+MYGfRMHSW9SUqBr0UB9kflYKCGFor7p0a0Q/vrMcaU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Fm1sTRgA; 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="Fm1sTRgA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5600C116B1; Tue, 16 Jul 2024 15:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721145050; bh=OgxTHOGAzB/xc7Mzf0HZRTolpVHRtB0yGjpSwmtgwF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fm1sTRgAPoWZhpEaf4zD8pMEwqEsQEG5kumfhDrRKmSsleIHaMdRTsFbijxbe2Qd5 Aqmb5YBrWc5m1QlGuFNDo6ILz0O9W3D35bOJPtbc3Mg7CRn+rr94GTSwOtqts2Iclu NTUypHs37heOGOGShWYKfZKNG6NkgsWo689SsNtc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joy Chakraborty , Dan Carpenter Subject: [PATCH 6.9 081/143] misc: microchip: pci1xxxx: Fix return value of nvmem callbacks Date: Tue, 16 Jul 2024 17:31:17 +0200 Message-ID: <20240716152759.092448029@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716152755.980289992@linuxfoundation.org> References: <20240716152755.980289992@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.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joy Chakraborty commit a6a0f04e7d28378c181f76d32e4f965aa6a8b0a5 upstream. Read/write callbacks registered with nvmem core expect 0 to be returned on success and a negative value to be returned on failure. Currently pci1xxxx_otp_read()/pci1xxxx_otp_write() and pci1xxxx_eeprom_read()/pci1xxxx_eeprom_write() return the number of bytes read/written on success. Fix to return 0 on success. Fixes: 9ab5465349c0 ("misc: microchip: pci1xxxx: Add support to read and write into PCI1XXXX EEPROM via NVMEM sysfs") Fixes: 0969001569e4 ("misc: microchip: pci1xxxx: Add support to read and write into PCI1XXXX OTP via NVMEM sysfs") Cc: stable@vger.kernel.org Signed-off-by: Joy Chakraborty Reviewed-by: Dan Carpenter Link: https://lore.kernel.org/r/20240612070031.1215558-1-joychakr@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c | 4 ---- 1 file changed, 4 deletions(-) --- a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c +++ b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c @@ -153,7 +153,6 @@ static int pci1xxxx_eeprom_read(void *pr buf[byte] = readl(rb + MMAP_EEPROM_OFFSET(EEPROM_DATA_REG)); } - ret = byte; error: release_sys_lock(priv); return ret; @@ -197,7 +196,6 @@ static int pci1xxxx_eeprom_write(void *p goto error; } } - ret = byte; error: release_sys_lock(priv); return ret; @@ -258,7 +256,6 @@ static int pci1xxxx_otp_read(void *priv_ buf[byte] = readl(rb + MMAP_OTP_OFFSET(OTP_RD_DATA_OFFSET)); } - ret = byte; error: release_sys_lock(priv); return ret; @@ -315,7 +312,6 @@ static int pci1xxxx_otp_write(void *priv goto error; } } - ret = byte; error: release_sys_lock(priv); return ret;