From: Ivan Safonov <insafonov@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kyle Kuffermann <kyle.kuffermann@gmail.com>,
Alexey Khoroshilov <khoroshilov@ispras.ru>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: Ivan Safonov <insafonov@gmail.com>
Subject: [PATCH 03/34] staging:r8188eu: remove pm_netdev_open function
Date: Sat, 8 Oct 2016 01:01:02 +0700 [thread overview]
Message-ID: <1475863293-27587-3-git-send-email-insafonov@gmail.com> (raw)
In-Reply-To: <1475863293-27587-1-git-send-email-insafonov@gmail.com>
netdev_open and ips_netdrv_open are used instead of pm_netdev_open.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +-
drivers/staging/rtl8188eu/include/osdep_intf.h | 3 ++-
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 16 ++--------------
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +-
4 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index 0b70fe7..fc6385b 100644
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -94,7 +94,7 @@ static int rtw_hw_resume(struct adapter *padapter)
pwrpriv->bips_processing = true;
rtw_reset_drv_sw(padapter);
- if (pm_netdev_open(pnetdev, false) != 0) {
+ if (ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev)) != _SUCCESS) {
mutex_unlock(&pwrpriv->mutex_lock);
goto error_exit;
}
diff --git a/drivers/staging/rtl8188eu/include/osdep_intf.h b/drivers/staging/rtl8188eu/include/osdep_intf.h
index dbd7dc4..97d3d85 100644
--- a/drivers/staging/rtl8188eu/include/osdep_intf.h
+++ b/drivers/staging/rtl8188eu/include/osdep_intf.h
@@ -35,7 +35,8 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname);
struct net_device *rtw_init_netdev(struct adapter *padapter);
u16 rtw_recv_select_queue(struct sk_buff *skb);
-int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
+int netdev_open(struct net_device *pnetdev);
+int ips_netdrv_open(struct adapter *padapter);
void rtw_ips_dev_unload(struct adapter *padapter);
int rtw_ips_pwr_up(struct adapter *padapter);
void rtw_ips_pwr_down(struct adapter *padapter);
diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 8d96e51..2a1e63d 100644
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -144,7 +144,6 @@ static bool rtw_monitor_enable;
module_param_named(monitor_enable, rtw_monitor_enable, bool, 0444);
MODULE_PARM_DESC(monitor_enable, "Enable monitor inferface (default: false)");
-static int netdev_open(struct net_device *pnetdev);
static int netdev_close(struct net_device *pnetdev);
static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
@@ -629,7 +628,7 @@ netdev_open_error:
return -1;
}
-static int netdev_open(struct net_device *pnetdev)
+int netdev_open(struct net_device *pnetdev)
{
int ret;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
@@ -641,7 +640,7 @@ static int netdev_open(struct net_device *pnetdev)
return ret;
}
-static int ips_netdrv_open(struct adapter *padapter)
+int ips_netdrv_open(struct adapter *padapter)
{
int status = _SUCCESS;
@@ -718,17 +717,6 @@ void rtw_ips_dev_unload(struct adapter *padapter)
rtw_hal_deinit(padapter);
}
-int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
-{
- int status;
-
- if (bnormal)
- status = netdev_open(pnetdev);
- else
- status = (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev))) ? (0) : (-1);
- return status;
-}
-
static int netdev_close(struct net_device *pnetdev)
{
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 4996332..94dac53 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -285,7 +285,7 @@ static int rtw_resume_process(struct adapter *padapter)
pwrpriv->bkeepfwalive = false;
pr_debug("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
- if (pm_netdev_open(pnetdev, true) != 0) {
+ if (netdev_open(pnetdev) != 0) {
mutex_unlock(&pwrpriv->mutex_lock);
goto exit;
}
--
2.7.3
next prev parent reply other threads:[~2016-10-07 18:00 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 18:01 [PATCH 01/34] staging:r8188eu: remove rtw_os_recv_resource_alloc function Ivan Safonov
2016-10-07 18:01 ` [PATCH 02/34] staging:r8188eu: remove wrappers for rtw_hal_inirp_init function Ivan Safonov
2016-10-07 18:01 ` Ivan Safonov [this message]
2016-10-07 18:01 ` [PATCH 04/34] staging:r8188eu: remove free_recv_buf_queue_cnt member of recv_priv structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 05/34] staging:r8188eu: remove skb data alignment in r8188eu driver code Ivan Safonov
2016-10-07 18:01 ` [PATCH 06/34] staging:r8188eu: change usb_read_port last argument type to (struct *recv_buf) Ivan Safonov
2016-10-07 18:01 ` [PATCH 07/34] staging:r8188eu: remove (u32 cnt) argument of usb_read_port function Ivan Safonov
2016-10-07 18:01 ` [PATCH 08/34] staging:r8188eu: remove ff_hwaddr member of recv_priv structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 09/34] staging:r8188eu: remove wrappers for LedControl8188eu function Ivan Safonov
2016-10-07 18:01 ` [PATCH 10/34] staging:r8188eu: remove bRegUseLed member of led_priv structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 11/34] staging:r8188eu: remove bLedStartToLinkBlinkInProgress and bSWLedCtrl members of LED_871x structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 12/34] staging:r8188eu: remove bLedOpenDrain member of hal_data_8188e structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 13/34] staging:r8188eu: remove ExternalPA " Ivan Safonov
2016-10-07 18:01 ` [PATCH 14/34] staging:r8188eu: remove unused members " Ivan Safonov
2016-10-07 18:01 ` [PATCH 15/34] staging:r8188eu: remove Antenna_(Lfet|Right) enumeration items Ivan Safonov
2016-10-07 18:01 ` [PATCH 16/34] staging:r8188eu: remove rf_chip member of hal_data_8188e structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 17/34] staging:r8188eu: remove RF_TYPE_8190P enumeration Ivan Safonov
2016-10-07 18:01 ` [PATCH 18/34] staging:r8188eu: remove NumTotalRFPath member of hal_data_8188e structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 19/34] staging:r8188eu: refactor rtl88eu_dm_txpower_tracking_callback_thermalmeter function Ivan Safonov
2016-10-07 18:01 ` [PATCH 20/34] staging:r8188eu: remove bTXPowerTrackingInit member of odm_rf_cal structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 21/34] staging:r8188eu: remove ANTTEST(ALL|A|B) definitions Ivan Safonov
2016-10-07 18:01 ` [PATCH 22/34] staging:r8188eu: remove rtw_endofpktfile function Ivan Safonov
2016-10-07 18:01 ` [PATCH 23/34] staging:r8188eu: remove padapter and free_sz arguments of rtw_os_xmit_resource_free function Ivan Safonov
2016-10-07 18:01 ` [PATCH 24/34] staging:r8188eu: remove unused function declerations Ivan Safonov
2016-10-07 18:01 ` [PATCH 25/34] staging:r8188eu: remove prhdr local variable from rtw_free_stainfo function Ivan Safonov
2016-10-07 18:01 ` [PATCH 26/34] staging:r8188eu: change type of the precv_buf member of recv_priv structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 27/34] staging:r8188eu: remove pallocated_recv_buf member of the " Ivan Safonov
2016-10-07 18:01 ` [PATCH 28/34] staging:r8188eu: remove intf_stop member of adapter structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 29/34] staging:r8188eu: remove free_recvframe_cnt member of recv_priv structure Ivan Safonov
2016-10-07 18:01 ` [PATCH 30/34] staging:r8188eu: remove rx_pending_cnt " Ivan Safonov
2016-10-07 18:01 ` [PATCH 31/34] staging:r8188eu: remove precv_frame_buf " Ivan Safonov
2016-10-07 18:01 ` [PATCH 32/34] staging:r8188eu: change poiter type from u8 to void for pallocated_frame_buf " Ivan Safonov
2016-10-07 18:01 ` [PATCH 33/34] staging:r8188eu: refactor recvbuf2recvframe function Ivan Safonov
2016-10-07 18:01 ` [PATCH 34/34] staging:r8188eu: remove unnecessary type cast for update_recvframe_phyinfo_88e argument Ivan Safonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475863293-27587-3-git-send-email-insafonov@gmail.com \
--to=insafonov@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=khoroshilov@ispras.ru \
--cc=kyle.kuffermann@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®