Return-path: Received: from smtp.codeaurora.org ([198.145.29.96]:58812 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932248AbcFJOaW (ORCPT ); Fri, 10 Jun 2016 10:30:22 -0400 From: Kalle Valo To: Javier Martinez Canillas Cc: linux-kernel@vger.kernel.org, Julian Calaby , Shengzhen Li , Enric Balletbo i Serra , Amitkumar Karwar , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, Nishant Sarmukadam Subject: Re: [PATCH v2 2/3] mwifiex: move .get_tx_power logic to station ioctl file References: <1465232558-31678-1-git-send-email-javier@osg.samsung.com> <1465232558-31678-3-git-send-email-javier@osg.samsung.com> Date: Fri, 10 Jun 2016 17:30:12 +0300 In-Reply-To: <1465232558-31678-3-git-send-email-javier@osg.samsung.com> (Javier Martinez Canillas's message of "Mon, 6 Jun 2016 13:02:37 -0400") Message-ID: <87wplxdsln.fsf@kamboji.qca.qualcomm.com> (sfid-20160610_163118_892493_64880434) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-wireless-owner@vger.kernel.org List-ID: Javier Martinez Canillas writes: > From: Shengzhen Li > > Most cfg80211 operations are just a wrappers to functions defined in the > sta_ioctl.c file, so for consistency move the .get_tx_power logic there. > > Signed-off-by: Shengzhen Li > Signed-off-by: Amitkumar Karwar > [javier: update the subject line and commit message] > Signed-off-by: Javier Martinez Canillas [...] > --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c > +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c > @@ -385,18 +385,10 @@ mwifiex_cfg80211_get_tx_power(struct wiphy *wiphy, > int *dbm) > { > struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy); > - struct mwifiex_private *priv = mwifiex_get_priv(adapter, > - MWIFIEX_BSS_ROLE_ANY); > - int ret = mwifiex_send_cmd(priv, HostCmd_CMD_RF_TX_PWR, > - HostCmd_ACT_GEN_GET, 0, NULL, true); > - > - if (ret < 0) > - return ret; > - > - /* tx_power_level is set in HostCmd_CMD_RF_TX_PWR command handler */ > - *dbm = priv->tx_power_level; > + struct mwifiex_private *priv; > > - return 0; > + priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY); > + return mwifiex_get_tx_power(priv, dbm); > } So in patch 1 you added the patch and in patch 2 you move it to a different location? That doesn't make any sense, can't you just fold the two patches into one so that the function is added only once. -- Kalle Valo