From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64B36C433E0 for ; Tue, 23 Jun 2020 02:52:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4300D2076A for ; Tue, 23 Jun 2020 02:52:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732293AbgFWCwo (ORCPT ); Mon, 22 Jun 2020 22:52:44 -0400 Received: from mx2.suse.de ([195.135.220.15]:33040 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731985AbgFWCvo (ORCPT ); Mon, 22 Jun 2020 22:51:44 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 62E89B1A7; Tue, 23 Jun 2020 02:51:43 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: linux-realtek-soc@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?James=20Tai=20=5B=E6=88=B4=E5=BF=97=E5=B3=B0=5D?= , =?UTF-8?q?Stanley=20Chang=20=5B=E6=98=8C=E8=82=B2=E5=BE=B7=5D?= , Edgar Lee , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Srinivas Kandagatla Subject: [PATCH v2 29/29] soc: realtek: chip: Adopt nvmem_cell_read_u8() helper Date: Tue, 23 Jun 2020 04:51:06 +0200 Message-Id: <20200623025106.31273-30-afaerber@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200623025106.31273-1-afaerber@suse.de> References: <20200623025106.31273-1-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace the local helper with the newly introduced official one. Cc: Srinivas Kandagatla Signed-off-by: Andreas Färber --- This could be squashed if the new API and this commit were to get merged in subsequent merge windows or with the help of a topic branch. v2: New drivers/soc/realtek/chip.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/drivers/soc/realtek/chip.c b/drivers/soc/realtek/chip.c index bed028ce1b16..46e0d9063b5d 100644 --- a/drivers/soc/realtek/chip.c +++ b/drivers/soc/realtek/chip.c @@ -79,33 +79,6 @@ struct dhc_soc { const char *codename; }; -static int dhc_efuse_read_u8(struct device *dev, const char *cell_id, u8 *val) -{ - struct nvmem_cell *cell; - void *buf; - size_t len; - - cell = nvmem_cell_get(dev, cell_id); - if (IS_ERR(cell)) - return PTR_ERR(cell); - - buf = nvmem_cell_read(cell, &len); - if (IS_ERR(buf)) { - nvmem_cell_put(cell); - return PTR_ERR(buf); - } - if (len != sizeof(*val)) { - kfree(buf); - nvmem_cell_put(cell); - return -EINVAL; - } - memcpy(val, buf, 1); - kfree(buf); - nvmem_cell_put(cell); - - return 0; -} - static const char *default_name(struct device *dev, const struct dhc_soc *s) { return s->family; @@ -118,7 +91,7 @@ static const char *rtd1295_name(struct device *dev, const struct dhc_soc *s) int ret; u8 b; - ret = dhc_efuse_read_u8(dev, "efuse_package_id", &b); + ret = nvmem_cell_read_u8(dev, "efuse_package_id", &b); if (ret == -EPROBE_DEFER) return ERR_PTR(ret); else if (ret) -- 2.26.2