From patchwork Wed Jul 24 11:27:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuhong Yuan X-Patchwork-Id: 11056619 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 268971398 for ; Wed, 24 Jul 2019 11:27:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1771428676 for ; Wed, 24 Jul 2019 11:27:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B99C2868C; Wed, 24 Jul 2019 11:27:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A26A228676 for ; Wed, 24 Jul 2019 11:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727582AbfGXL12 (ORCPT ); Wed, 24 Jul 2019 07:27:28 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:46247 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727564AbfGXL11 (ORCPT ); Wed, 24 Jul 2019 07:27:27 -0400 Received: by mail-pg1-f195.google.com with SMTP id k189so2046102pgk.13; Wed, 24 Jul 2019 04:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=b4DxcTaeexPnaVFulxgnZmsQIq5RlnqnEKxY7Kh+oe0=; b=qwp0r4F7dH0xpc0WddOmAfplVDQ5zK5P8BbLITgy9s9y2FpC3kCMw26YiSktTcRBxy hExWUt3KxE8WdBpaW+5Ur8bI0HOwoIeonJZURRk/LmkbCEzPfDB0G0T9pUFlak2tAyEG jLMfExcEcekrvrTdLe2Yi1CLtET55E3yRp3bxPiMgsNcE57yHzOFs2qLmWOxREL4SWN9 PiroeMRXnhNjFHOMhM8RzqwQSpLABK8nlAoVedkUal/+KP8j9o+uaIyPzEBz7kj3ItId SCELkl8uGEi2hEISgQY4J7Qm2wLQcSRgKSnzP4YOdZc9rhbv9TSzhqAc/HK+qD1PX3+2 tgVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=b4DxcTaeexPnaVFulxgnZmsQIq5RlnqnEKxY7Kh+oe0=; b=Xho/bkursl96M6VB1bHdUqk4oyx6mzGdVQjuh/gmAAGw8ErG5D/2szQwkt/OyWnP7n +RC+O2sY6dF8lCyJQb4W905JD6T9tXx6U/ycBTwkGiDE3bW7hX+I/oZkwH1UAqekSmUr PWTKrSjFuO1cIh7hbMXgGDmiWghkBepIigEwmTQAjtnSwP6yFgdrwkhKJSClYmStIm+K Aj1skb7A/QSc6tQuh1rJVOoOXhBQKQjvpAf0jOxD26hNnheClrLGkyP6nOtVBTUzM2NP p55wTIztcy4zFGUAvlzvIRWqBXrDYT5tHHi4l8UZAyHuabopgEvNfGcX6C0jI5GWm0Gj IlNA== X-Gm-Message-State: APjAAAXn0bMuWJ1TXv0wrqth0+6azLwZQfM19lwCO4q8+PBPH3UPE/60 J86genya+hHdDYOfEswe/uMvhs2cuBE= X-Google-Smtp-Source: APXvYqycfVcHScdr7+gEN4ivvTtR92ARiffYrtKhWntNt1vy16afr/6LUDhxMyD86Rp7SPmxuO0qxw== X-Received: by 2002:a17:90a:4f0e:: with SMTP id p14mr84329540pjh.40.1563967647157; Wed, 24 Jul 2019 04:27:27 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([89.31.126.54]) by smtp.gmail.com with ESMTPSA id f20sm50411675pgg.56.2019.07.24.04.27.23 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 04:27:26 -0700 (PDT) From: Chuhong Yuan Cc: Jiri Slaby , Nick Kossifidis , Luis Chamberlain , Kalle Valo , "David S . Miller" , QCA ath9k Development , Maya Erez , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, wil6210@qti.qualcomm.com, Chuhong Yuan Subject: [PATCH net-next 05/10] ath: Use dev_get_drvdata where possible Date: Wed, 24 Jul 2019 19:27:20 +0800 Message-Id: <20190724112720.13349-1-hslester96@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of using to_pci_dev + pci_get_drvdata, use dev_get_drvdata to make code simpler. Signed-off-by: Chuhong Yuan --- drivers/net/wireless/ath/ath5k/pci.c | 3 +-- drivers/net/wireless/ath/ath9k/pci.c | 5 ++--- drivers/net/wireless/ath/wil6210/pcie_bus.c | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c index c6156cc38940..e1378e203611 100644 --- a/drivers/net/wireless/ath/ath5k/pci.c +++ b/drivers/net/wireless/ath/ath5k/pci.c @@ -301,8 +301,7 @@ ath5k_pci_remove(struct pci_dev *pdev) #ifdef CONFIG_PM_SLEEP static int ath5k_pci_suspend(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct ieee80211_hw *hw = pci_get_drvdata(pdev); + struct ieee80211_hw *hw = dev_get_drvdata(dev); struct ath5k_hw *ah = hw->priv; ath5k_led_off(ah); diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 92b2dd396436..f3461b193c7a 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c @@ -1021,13 +1021,12 @@ static void ath_pci_remove(struct pci_dev *pdev) static int ath_pci_suspend(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct ieee80211_hw *hw = pci_get_drvdata(pdev); + struct ieee80211_hw *hw = dev_get_drvdata(device); struct ath_softc *sc = hw->priv; struct ath_common *common = ath9k_hw_common(sc->sc_ah); if (test_bit(ATH_OP_WOW_ENABLED, &common->op_flags)) { - dev_info(&pdev->dev, "WOW is enabled, bypassing PCI suspend\n"); + dev_info(device, "WOW is enabled, bypassing PCI suspend\n"); return 0; } diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c index 9f5a914abc18..1b0625987d76 100644 --- a/drivers/net/wireless/ath/wil6210/pcie_bus.c +++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c @@ -631,8 +631,7 @@ static int __maybe_unused wil6210_pm_resume(struct device *dev) static int __maybe_unused wil6210_pm_runtime_idle(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct wil6210_priv *wil = pci_get_drvdata(pdev); + struct wil6210_priv *wil = dev_get_drvdata(dev); wil_dbg_pm(wil, "Runtime idle\n"); @@ -646,8 +645,7 @@ static int __maybe_unused wil6210_pm_runtime_resume(struct device *dev) static int __maybe_unused wil6210_pm_runtime_suspend(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct wil6210_priv *wil = pci_get_drvdata(pdev); + struct wil6210_priv *wil = dev_get_drvdata(dev); if (test_bit(wil_status_suspended, wil->status)) { wil_dbg_pm(wil, "trying to suspend while suspended\n"); From patchwork Wed Jul 24 11:27:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuhong Yuan X-Patchwork-Id: 11056621 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 985201398 for ; Wed, 24 Jul 2019 11:27:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 880C728682 for ; Wed, 24 Jul 2019 11:27:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C00628746; Wed, 24 Jul 2019 11:27:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A3AC28682 for ; Wed, 24 Jul 2019 11:27:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727614AbfGXL1g (ORCPT ); Wed, 24 Jul 2019 07:27:36 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38914 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727439AbfGXL1g (ORCPT ); Wed, 24 Jul 2019 07:27:36 -0400 Received: by mail-pg1-f195.google.com with SMTP id u17so21086362pgi.6; Wed, 24 Jul 2019 04:27:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bcioE0DGUFJw/yrsZdFFy4R7kTbvkLIl7gGiYNHkNrA=; b=pkh9CKX/LAVggmd8KSgSJjcyP2axsA3oZ2hQZpHmxZVNe+vBattVZxJ4ps6NppX0Mz 3Fc915iJip0j6Y00C9hhA6RaJFFTkl3SxssWvzSTmUwYb0BRCQNlwzRxT78xUNRlYSdm e3EwWyFQKqNG+Biri4T+kV73TUbCY4wbX1DcVw4miw9gQ57yKYWzQfZX7CRIMxdfvCSz kD7S0WWpEUsaaIPCjJGk9KsmyMy3YOj1KLlT68hqST9SR76wt90gSGE5oKTLug7MZo4H pqIZhjT3N3g+Kr3ELPaiVUXkOSsa5nV+Ji0WAcR8XOwWsr+T8Qc4pkda1t+hXig6uVzo vB3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bcioE0DGUFJw/yrsZdFFy4R7kTbvkLIl7gGiYNHkNrA=; b=VH7tQrUPQUs6Mg1v2z7e906FM124WgNW6NnVnvvTdfiU2koOLP9Rfo7WDXD/zThjxC 6J3v3RAaEdOgGdrRb0GT/HeMjuCFHP7GEevQMktkjjqq1ZW6CbGqubF+PEgDt06NMyvP 5q6ZRCWFX5ADsx88AWAtVcbpmJoSaFVzG6Kk/mhKcAu/22Od9Wk2xwQY+pUbJSQA/Rhr k1MtqONuF4DGGDvCtA+ML+lcSB7K5tjvN/dAbyvOeApTFjp9uoPwLs3xMzNKiaLgBORA EMkkbnmsNcJ1NXIxGW7aYqjeA0XvmbGkTlBgI3K6bIj5qMOFYSM6aEyGTv/UxHebncg5 hIAQ== X-Gm-Message-State: APjAAAXPiLl7qfz6qsX6GX34x10nA70BRpevmaq4zRwrqLdswAzgL848 4by4b8ca33Az6tpLYTpkkO0= X-Google-Smtp-Source: APXvYqyRE+phszV3MvNPj/mXY/s4lkPP/dJzypRRSnJ6Byzz1CJE39bNZqH40JFjXAu91V3hMs+qOw== X-Received: by 2002:a63:4846:: with SMTP id x6mr44830409pgk.332.1563967655646; Wed, 24 Jul 2019 04:27:35 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([89.31.126.54]) by smtp.gmail.com with ESMTPSA id l1sm60883684pfl.9.2019.07.24.04.27.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 04:27:35 -0700 (PDT) From: Chuhong Yuan Cc: Stanislaw Gruszka , Kalle Valo , "David S . Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH net-next 06/10] iwlegacy: Use dev_get_drvdata where possible Date: Wed, 24 Jul 2019 19:27:30 +0800 Message-Id: <20190724112730.13403-1-hslester96@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of using to_pci_dev + pci_get_drvdata, use dev_get_drvdata to make code simpler. Signed-off-by: Chuhong Yuan --- drivers/net/wireless/intel/iwlegacy/common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c index 4a88e35d58d7..73f7bbf742bc 100644 --- a/drivers/net/wireless/intel/iwlegacy/common.c +++ b/drivers/net/wireless/intel/iwlegacy/common.c @@ -4942,8 +4942,7 @@ EXPORT_SYMBOL(il_add_beacon_time); static int il_pci_suspend(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct il_priv *il = pci_get_drvdata(pdev); + struct il_priv *il = dev_get_drvdata(device); /* * This function is called when system goes into suspend state From patchwork Wed Jul 24 11:27:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuhong Yuan X-Patchwork-Id: 11056623 X-Patchwork-Delegate: luca@coelho.fi Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2BAE113AC for ; Wed, 24 Jul 2019 11:27:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D55528676 for ; Wed, 24 Jul 2019 11:27:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1158128758; Wed, 24 Jul 2019 11:27:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 626EB28746 for ; Wed, 24 Jul 2019 11:27:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727650AbfGXL1p (ORCPT ); Wed, 24 Jul 2019 07:27:45 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:44837 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727368AbfGXL1p (ORCPT ); Wed, 24 Jul 2019 07:27:45 -0400 Received: by mail-pg1-f194.google.com with SMTP id i18so21089079pgl.11; Wed, 24 Jul 2019 04:27:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7IR+uM+j5koIPBW7Xm8FY732aVxv1FIX3BlElSJL8Ys=; b=WYT46Etclh2BRTLLlTCKaJz2sGvVnXzruG+odXhQVXIP3TB/nCW4zE4muSr1Ooypxw VkfEtU3W2UqgH5se/CJ4OsknHNDvrtuJxSwgYdOinDJytVvuMgLJiMJTJtNklC8DWQ2s eomxXn/7JAVADbtY4+KdUmRcJLcQrgQOxvrNYyobdEFddBO9I6jCrmH2T1eS/3pcBN6W taK5i//Ks7WA1vjzmLT3ep1VJc28sPR6CYvMchwkqeC3cQehnCUqRlCG+yzikuUNlEko pCQxAJ1TN8hUZBLF3CBNeYfqitid28xNF6o2gpKtOSB44RsakGKvM85XU53l1lIS7bfz ahyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7IR+uM+j5koIPBW7Xm8FY732aVxv1FIX3BlElSJL8Ys=; b=FB0Ji0A46OOGX0kzASb+K0Y65UltBGYtwOfDfPtuSQoK23xMr+fgU2jFHvhB8djKTA X05Pk3x+Z8fri0vBxZrxY9bmn2JKFb3d98ruTHEPGTrbT6sRhPvzATr48NZc0wTF9pim MqBSYqkT5uXvksLBWEQyMnIfxK8TDYd2cqJvSwKIs1B8Y8Ow7i9hYWchugwzgdvGRlbq UV3KaWzMTnrHs9HzM9JadOtGm8WzrU2nOaxLWicSLqFBYzLZU4PwmEan2ceu1H6pPQqU Vcr2nqXM8gLe4XGWmecduvD8lcUFaURFjg3iJarp1OGggrQlFXh+aLJIZRRr51KiU+5E cexA== X-Gm-Message-State: APjAAAUbx7w0uKPdQRN0BVx2fvR7ceJe8WX8xR43KYwU1R7+taW3QS6x a72+sKCDztN8GvbF4G90VDM= X-Google-Smtp-Source: APXvYqz6sN2JwpXp26sb8CBgIE5le7DadChkZCVYYMfhfmyDHN/y5tSMhuPY4RW4VWNSDY6xfLPZAQ== X-Received: by 2002:a63:2744:: with SMTP id n65mr67926788pgn.277.1563967664643; Wed, 24 Jul 2019 04:27:44 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([89.31.126.54]) by smtp.gmail.com with ESMTPSA id v185sm52804086pfb.14.2019.07.24.04.27.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 04:27:44 -0700 (PDT) From: Chuhong Yuan Cc: Johannes Berg , Emmanuel Grumbach , Luca Coelho , Intel Linux Wireless , Kalle Valo , "David S . Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH net-next 07/10] iwlwifi: Use dev_get_drvdata where possible Date: Wed, 24 Jul 2019 19:27:38 +0800 Message-Id: <20190724112738.13457-1-hslester96@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of using to_pci_dev + pci_get_drvdata, use dev_get_drvdata to make code simpler. Signed-off-by: Chuhong Yuan --- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index ea2a03d4bf55..fe76e1540d39 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1248,8 +1248,7 @@ int iwl_pci_fw_exit_d0i3(struct iwl_trans *trans) #ifdef CONFIG_IWLWIFI_PCIE_RTPM static int iwl_pci_runtime_suspend(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct iwl_trans *trans = pci_get_drvdata(pdev); + struct iwl_trans *trans = dev_get_drvdata(device); int ret; IWL_DEBUG_RPM(trans, "entering runtime suspend\n"); @@ -1269,8 +1268,7 @@ static int iwl_pci_runtime_suspend(struct device *device) static int iwl_pci_runtime_resume(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct iwl_trans *trans = pci_get_drvdata(pdev); + struct iwl_trans *trans = dev_get_drvdata(device); enum iwl_d3_status d3_status; IWL_DEBUG_RPM(trans, "exiting runtime suspend (resume)\n"); @@ -1285,8 +1283,7 @@ static int iwl_pci_runtime_resume(struct device *device) static int iwl_pci_system_prepare(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct iwl_trans *trans = pci_get_drvdata(pdev); + struct iwl_trans *trans = dev_get_drvdata(device); IWL_DEBUG_RPM(trans, "preparing for system suspend\n"); @@ -1308,8 +1305,7 @@ static int iwl_pci_system_prepare(struct device *device) static void iwl_pci_system_complete(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct iwl_trans *trans = pci_get_drvdata(pdev); + struct iwl_trans *trans = dev_get_drvdata(device); IWL_DEBUG_RPM(trans, "completing system suspend\n"); From patchwork Wed Jul 24 11:27:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuhong Yuan X-Patchwork-Id: 11056625 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8FA813AC for ; Wed, 24 Jul 2019 11:27:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A142285E3 for ; Wed, 24 Jul 2019 11:27:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DC322868C; Wed, 24 Jul 2019 11:27:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DCE528682 for ; Wed, 24 Jul 2019 11:27:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727692AbfGXL1x (ORCPT ); Wed, 24 Jul 2019 07:27:53 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:43694 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727378AbfGXL1w (ORCPT ); Wed, 24 Jul 2019 07:27:52 -0400 Received: by mail-pf1-f196.google.com with SMTP id i189so20808151pfg.10; Wed, 24 Jul 2019 04:27:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Iund/UB9gNsEMyB6ZwMB2lOVuWc9Eufb+ac0l5cR60E=; b=at5NcK2seyInJhe4u9iZiFKeIfzZQWhTWl+QhvVQcV7D9M//dLJUrKYzGFxjC0HXTi k4nZxcMQbMrdMEsuDie5/nVQhir0mPkiPOCqm+KYVPmhAVw2z0arLEZJBUR8lTgmlXbc kY2cjErIl28ZGU+CcVLQpH0ATIvHRoAuw8dkdemCUpCdN1cwmaojPUsw5/NISm761tzb a5rGOa8w3lqNtW12CHlo0YkMWwEQBRGcFHLTMQP3PAfZKwpI6PksHQ1b3fqBqPf1mg00 7flTBtzDR9yjiXPEziOMiwgECAzhLpJRLU85M2jLM9DrweIx8LS/8MqdS2b2Mnsu9aFZ AuEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Iund/UB9gNsEMyB6ZwMB2lOVuWc9Eufb+ac0l5cR60E=; b=rPRmI7LLWGAirx8v8+QMjVJ2BTl0OMV9P6TZrIuaMVM9YU6dwInd8Y00DgIalF24ki R/zgs/21KLDBdAfY2kONuSkWz0lJh9o+Y7nxAqtQkx22+qjy1uUff4heTNvbKBOxeWsb 55CDq6KZ8pT3WewTFZVmlR+nCLTfAsg8hWTZqT/jUiVpSJETUwYs6tNoAlW6eNVHl3x4 bt4YXUriDvjpJdPgtR5uyUswaJAiZ2Pjjnr0xyJwOcLryap8Yiyx51+FFbwgjcgAE9uA +AQcWnv/bmOQLVZdqbeUK6GUmj/yi+GLdCTQWIm9W8lmZoPQTnlUbvl0uOaBK7L3i0Ia rvOA== X-Gm-Message-State: APjAAAUkYgIKBSC1AfOxLsUjblsdccbXhBlEFRGLxYUUbxDIdo+a9kGL Oo63n2LTIi7iHXF2RumO3rA= X-Google-Smtp-Source: APXvYqzw5Y+tX9XJPPEn3RACN7m9XmWz0i+yjVNwBS+UWPXJPSUIz0iS40yEgEuMqNKxHJVvO23Wmw== X-Received: by 2002:a17:90a:8c92:: with SMTP id b18mr85600256pjo.97.1563967672272; Wed, 24 Jul 2019 04:27:52 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([89.31.126.54]) by smtp.gmail.com with ESMTPSA id x9sm54902521pfn.177.2019.07.24.04.27.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 04:27:51 -0700 (PDT) From: Chuhong Yuan Cc: Amitkumar Karwar , Nishant Sarmukadam , Ganapathi Bhat , Xinming Hu , Kalle Valo , "David S . Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH net-next 08/10] mwifiex: pcie: Use dev_get_drvdata Date: Wed, 24 Jul 2019 19:27:45 +0800 Message-Id: <20190724112745.13511-1-hslester96@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of using to_pci_dev + pci_get_drvdata, use dev_get_drvdata to make code simpler. Signed-off-by: Chuhong Yuan --- drivers/net/wireless/marvell/mwifiex/pcie.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index b54f73e3d508..eff06d59e9df 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -150,10 +150,8 @@ static bool mwifiex_pcie_ok_to_access_hw(struct mwifiex_adapter *adapter) static int mwifiex_pcie_suspend(struct device *dev) { struct mwifiex_adapter *adapter; - struct pcie_service_card *card; - struct pci_dev *pdev = to_pci_dev(dev); + struct pcie_service_card *card = dev_get_drvdata(dev); - card = pci_get_drvdata(pdev); /* Might still be loading firmware */ wait_for_completion(&card->fw_done); @@ -195,10 +193,8 @@ static int mwifiex_pcie_suspend(struct device *dev) static int mwifiex_pcie_resume(struct device *dev) { struct mwifiex_adapter *adapter; - struct pcie_service_card *card; - struct pci_dev *pdev = to_pci_dev(dev); + struct pcie_service_card *card = dev_get_drvdata(dev); - card = pci_get_drvdata(pdev); if (!card->adapter) { dev_err(dev, "adapter structure is not valid\n"); From patchwork Wed Jul 24 11:27:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuhong Yuan X-Patchwork-Id: 11056627 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AAB3D1398 for ; Wed, 24 Jul 2019 11:28:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BC50285E3 for ; Wed, 24 Jul 2019 11:28:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FBD828682; Wed, 24 Jul 2019 11:28:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46554285E3 for ; Wed, 24 Jul 2019 11:28:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727733AbfGXL2B (ORCPT ); Wed, 24 Jul 2019 07:28:01 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:39261 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727378AbfGXL2A (ORCPT ); Wed, 24 Jul 2019 07:28:00 -0400 Received: by mail-pf1-f193.google.com with SMTP id f17so16812834pfn.6; Wed, 24 Jul 2019 04:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RUZd1L/tbuG5frd+itzwjf88FkNkecv/3GnnUpUlJiE=; b=GWconWTCQVo9h09maZtvF0R68K/35Cbtr5RXbwCJZAL7DZSwg7Rfy0ZksTPyMS+Z/M Nz5JOTnFXc/ORVg5cJgFXFRF+cs/Aldn2dSsl6k+9kZIMmGSA6f0nKSA7/0b3vH+b5xe 03PuCT1XFSbhgbGnE1IxMql7pUAHkfbkOBygfn1VVVa7MguyVATIpivcr/aOye3WsTjm 1rpVlklwkGp3fBVhzN/ULYLqpYGVAkiuMrCpxq1OgvfFQpalQwuvI3q9ljYm0sZMlOE9 dR4EGTY6WEe9jC3m+3h4Cl427UaJS1KlOzQFCrGiXuDxTI4WOXxIFL0He8oGt+OEPwoj YURA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RUZd1L/tbuG5frd+itzwjf88FkNkecv/3GnnUpUlJiE=; b=nbCbu61mY/D4Sj0EieyHY1sakKhTxbn1MLPkpuQcw/vOk6T/x5kU14qPps0rGV4lA3 edQ7QldS2l9IlrddePAKY1GvWtuDa+uR+JTMUDGuxpAlMcuePKChPTKWM4vU+fsojtNC 5dHdApXjg9lyXw7D0uHk5C7EiRHzn8/qCs4I9tVQzO783trMpF7aub5ko9TNbzwQXENt da1Mw40dXtkqYMfx6LA6YuDel/E638l/FbPWZ+1RPCJJRCpjebtcxEyl8O6d+rq1cQNE NUIlz60rO7MOIgLySSnWisvgh/YPeKGBet9N5O64np1r6dbWxElFb+ehucgUfY6WsP2y YZ4Q== X-Gm-Message-State: APjAAAXGAaekZbfiCzUdjDaVMaF0xF/JVMWnXwL5GoIACPhs+eHHqCQI jdHpFWp/eIETQ3y4o8UWCYGwRrpGwfU= X-Google-Smtp-Source: APXvYqxo0lOBXSCRpv9wkIh28rqDgDAlKJ3W9UaDu+8quoBa8sWPbh6npjASONC4F6ZmSB66I29bCg== X-Received: by 2002:a17:90a:37e9:: with SMTP id v96mr85412477pjb.10.1563967680108; Wed, 24 Jul 2019 04:28:00 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([89.31.126.54]) by smtp.gmail.com with ESMTPSA id d17sm48731195pgl.66.2019.07.24.04.27.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 04:27:59 -0700 (PDT) From: Chuhong Yuan Cc: Igor Mitsyanko , Avinash Patil , Sergey Matyukevich , Kalle Valo , "David S . Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH net-next 09/10] qtnfmac_pcie: Use dev_get_drvdata Date: Wed, 24 Jul 2019 19:27:53 +0800 Message-Id: <20190724112753.13566-1-hslester96@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of using to_pci_dev + pci_get_drvdata, use dev_get_drvdata to make code simpler. Signed-off-by: Chuhong Yuan --- drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c index e4e9344b6982..8ae318b5fe54 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c +++ b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c @@ -430,7 +430,7 @@ static int qtnf_pcie_suspend(struct device *dev) struct qtnf_pcie_bus_priv *priv; struct qtnf_bus *bus; - bus = pci_get_drvdata(to_pci_dev(dev)); + bus = dev_get_drvdata(dev); if (!bus) return -EFAULT; @@ -443,7 +443,7 @@ static int qtnf_pcie_resume(struct device *dev) struct qtnf_pcie_bus_priv *priv; struct qtnf_bus *bus; - bus = pci_get_drvdata(to_pci_dev(dev)); + bus = dev_get_drvdata(dev); if (!bus) return -EFAULT; From patchwork Wed Jul 24 11:28:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuhong Yuan X-Patchwork-Id: 11056629 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 99AA413AC for ; Wed, 24 Jul 2019 11:28:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89BF028682 for ; Wed, 24 Jul 2019 11:28:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DCFB28746; Wed, 24 Jul 2019 11:28:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CC7B28682 for ; Wed, 24 Jul 2019 11:28:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727763AbfGXL2I (ORCPT ); Wed, 24 Jul 2019 07:28:08 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:37417 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727378AbfGXL2I (ORCPT ); Wed, 24 Jul 2019 07:28:08 -0400 Received: by mail-pf1-f196.google.com with SMTP id 19so20807699pfa.4; Wed, 24 Jul 2019 04:28:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lPJODdHXNUOCzN4xKheoilyC8acYqYcYpJHRoZ1WYTE=; b=Fu4nqhcYDzCc4ntaKb7ylasjdocx9Eikc8FaHxArxaS6uDPqCuh0EK2dtQE/solJ18 gHBjVEBwBhyF93uBI2c8ePdVZyBMIDhosx2JlikkAUWUUliM+tALQ45lZaXeluBMMkNH iyIjEKS2SC7V9BTbIUtUlTvknLk70VBWxUi0K64JapboigZ5Sd2gO7cnai4ozu/V5JHN GLH72jKqthjH2jBTHL28YcJEhFc/A6XTRJ8mAijVaf/ZJgdmbT9ncnK8k4puUhpVk4zI 6dokJZRsqmHgbyCbWNbv6rW2KZ3jY3nnlcrLVPIGK//+6DrK2LNPjBjFMQwuwtD2tUiY ywWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lPJODdHXNUOCzN4xKheoilyC8acYqYcYpJHRoZ1WYTE=; b=WMel2vub18xNkOTGA75I3Ic/xNbzU9hn7JUNUiads+IL4UfI/LKBMJb6EtKZa79RK+ h5y4Yk6UyrghZF588eeP7XHmjvl3bP3kaF7vmvPKk90Y6CO6D9yg0OkZOLYXN9iIDqp6 eBy+VVmKQ676JaMIKcMRCQOIAwnaiT02Qnsaffwo59n+uYAy1KyJalWQLOH0dfoFjNdJ ZQ4qgupPuZA670Lwv+ilmsi2JYjooyGuT7Nhko91Yz4M9Lo53Ddtx9097e0dRtkJRBef YwGwaGb2TTndTTFutLIEVUguZqC6jZH419AV/Wf38nOp/8SpvyQyqqaWOJ0Uy3GuyUTf bHKA== X-Gm-Message-State: APjAAAVMos1gaQ9J/mHSzpy4UDJbTIzQjbPEYr9pqKieG/h90+HpxvIF ZAuQJFqBzZJAUJy8A8u3sZ0= X-Google-Smtp-Source: APXvYqwjl6M6gzKYKVaYmJV0bxSI+Rd5/9Ly6OfIsh//DBqkDgM+0ehH9CSiJf3Or7y+qJZk8KikTg== X-Received: by 2002:a62:8f91:: with SMTP id n139mr11098810pfd.48.1563967687615; Wed, 24 Jul 2019 04:28:07 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([89.31.126.54]) by smtp.gmail.com with ESMTPSA id e13sm58185441pff.45.2019.07.24.04.28.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 04:28:07 -0700 (PDT) From: Chuhong Yuan Cc: Ping-Ke Shih , Kalle Valo , "David S . Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH net-next 10/10] rtlwifi: rtl_pci: Use dev_get_drvdata Date: Wed, 24 Jul 2019 19:28:02 +0800 Message-Id: <20190724112802.13620-1-hslester96@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of using to_pci_dev + pci_get_drvdata, use dev_get_drvdata to make code simpler. Signed-off-by: Chuhong Yuan --- drivers/net/wireless/realtek/rtlwifi/pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c index 4055e0ab75ba..7d96fe5f1a44 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.c +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c @@ -2409,8 +2409,7 @@ EXPORT_SYMBOL(rtl_pci_disconnect); ****************************************/ int rtl_pci_suspend(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct ieee80211_hw *hw = pci_get_drvdata(pdev); + struct ieee80211_hw *hw = dev_get_drvdata(dev); struct rtl_priv *rtlpriv = rtl_priv(hw); rtlpriv->cfg->ops->hw_suspend(hw); @@ -2422,8 +2421,7 @@ EXPORT_SYMBOL(rtl_pci_suspend); int rtl_pci_resume(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct ieee80211_hw *hw = pci_get_drvdata(pdev); + struct ieee80211_hw *hw = dev_get_drvdata(dev); struct rtl_priv *rtlpriv = rtl_priv(hw); rtlpriv->cfg->ops->hw_resume(hw);