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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A36C7C0015E for ; Thu, 13 Jul 2023 02:46:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233646AbjGMCqy (ORCPT ); Wed, 12 Jul 2023 22:46:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229646AbjGMCqx (ORCPT ); Wed, 12 Jul 2023 22:46:53 -0400 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F2AEC2; Wed, 12 Jul 2023 19:46:52 -0700 (PDT) Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1qJmLp-0005gV-2Y; Thu, 13 Jul 2023 02:46:42 +0000 Date: Thu, 13 Jul 2023 03:46:30 +0100 From: Daniel Golle To: Christian Marangi Cc: Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Shayne Chen , Sean Wang , Kalle Valo , Matthias Brugger , AngeloGioacchino Del Regno , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: Re: [PATCH 1/2] wifi: mt76: split get_of_eeprom in subfunction Message-ID: References: <20230708182936.24469-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230708182936.24469-1-ansuelsmth@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jul 08, 2023 at 08:29:35PM +0200, Christian Marangi wrote: > In preparation for NVMEM support, split get_of_eeprom() in subfunction > to tidy the code and facilitate the addition of alternative method to > get eeprom data. No behaviour change intended. > > While at it also drop OF ifdef checks as OF have stubs and calling > of_get_property would result in the same error returned. > > Signed-off-by: Christian Marangi Reviewed-by: Daniel Golle Tested-by: Daniel Golle > --- > drivers/net/wireless/mediatek/mt76/eeprom.c | 51 ++++++++++++++------- > 1 file changed, 35 insertions(+), 16 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c > index dce851d42e08..c3a762074be8 100644 > --- a/drivers/net/wireless/mediatek/mt76/eeprom.c > +++ b/drivers/net/wireless/mediatek/mt76/eeprom.c > @@ -9,31 +9,35 @@ > #include > #include "mt76.h" > > -int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len) > +static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len) > { > -#if defined(CONFIG_OF) && defined(CONFIG_MTD) > struct device_node *np = dev->dev->of_node; > - struct mtd_info *mtd; > - const __be32 *list; > const void *data; > - const char *part; > - phandle phandle; > int size; > - size_t retlen; > - int ret; > > - if (!np) > + data = of_get_property(np, "mediatek,eeprom-data", &size); > + if (!data) > return -ENOENT; > > - data = of_get_property(np, "mediatek,eeprom-data", &size); > - if (data) { > - if (size > len) > - return -EINVAL; > + if (size > len) > + return -EINVAL; > > - memcpy(eep, data, size); > + memcpy(eep, data, size); > > - return 0; > - } > + return 0; > +} > + > +static int mt76_get_of_epprom_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len) > +{ > +#ifdef CONFIG_MTD > + struct device_node *np = dev->dev->of_node; > + struct mtd_info *mtd; > + const __be32 *list; > + const char *part; > + phandle phandle; > + size_t retlen; > + int size; > + int ret; > > list = of_get_property(np, "mediatek,mtd-eeprom", &size); > if (!list) > @@ -100,6 +104,21 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len) > return -ENOENT; > #endif > } > + > +int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len) > +{ > + struct device_node *np = dev->dev->of_node; > + int ret; > + > + if (!np) > + return -ENOENT; > + > + ret = mt76_get_of_eeprom_data(dev, eep, len); > + if (!ret) > + return 0; > + > + return mt76_get_of_epprom_from_mtd(dev, eep, offset, len); > +} > EXPORT_SYMBOL_GPL(mt76_get_of_eeprom); > > void > -- > 2.40.1 > >