From: Vaibhav Gupta <vaibhav.varodek@gmail.com>
To: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Bjorn Helgaas <helgaas@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Jakub Kicinski <kuba@kernel.org>,
linux-kernel-mentees@lists.linuxfoundation.org,
"David S. Miller" <davem@davemloft.net>,
Kalle Valo <kvalo@codeaurora.org>
Subject: Re: [Linux-kernel-mentees] [PATCH v1] orinoco: use generic power management
Date: Wed, 1 Jul 2020 11:15:13 +0530 [thread overview]
Message-ID: <CAPBsFfCGfyFkeVvUC0QCnr9J4uvfubHoHjgPR9e+muPkYRj9vg@mail.gmail.com> (raw)
In-Reply-To: <20200624174048.64754-1-vaibhavgupta40@gmail.com>
On Wed, 24 Jun 2020 at 23:14, Vaibhav Gupta <vaibhavgupta40@gmail.com> wrote:
>
> With the support of generic PM callbacks, drivers no longer need to use
> legacy .suspend() and .resume() in which they had to maintain PCI states
> changes and device's power state themselves. The required operations are
> done by PCI core.
>
> PCI drivers are not expected to invoke PCI helper functions like
> pci_save/restore_state(), pci_enable/disable_device(),
> pci_set_power_state(), etc. Their tasks are completed by PCI core itself.
>
> Compile-tested only.
>
> Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
> ---
> .../intersil/orinoco/orinoco_nortel.c | 3 +-
> .../wireless/intersil/orinoco/orinoco_pci.c | 3 +-
> .../wireless/intersil/orinoco/orinoco_pci.h | 32 ++++++-------------
> .../wireless/intersil/orinoco/orinoco_plx.c | 3 +-
> .../wireless/intersil/orinoco/orinoco_tmd.c | 3 +-
> 5 files changed, 13 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c b/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c
> index 048693b6c6c2..96a03d10a080 100644
> --- a/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c
> +++ b/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c
> @@ -290,8 +290,7 @@ static struct pci_driver orinoco_nortel_driver = {
> .id_table = orinoco_nortel_id_table,
> .probe = orinoco_nortel_init_one,
> .remove = orinoco_nortel_remove_one,
> - .suspend = orinoco_pci_suspend,
> - .resume = orinoco_pci_resume,
> + .driver.pm = &orinoco_pci_pm_ops,
> };
>
> static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
> diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_pci.c b/drivers/net/wireless/intersil/orinoco/orinoco_pci.c
> index 4938a2208a37..f3c86b07b1b9 100644
> --- a/drivers/net/wireless/intersil/orinoco/orinoco_pci.c
> +++ b/drivers/net/wireless/intersil/orinoco/orinoco_pci.c
> @@ -230,8 +230,7 @@ static struct pci_driver orinoco_pci_driver = {
> .id_table = orinoco_pci_id_table,
> .probe = orinoco_pci_init_one,
> .remove = orinoco_pci_remove_one,
> - .suspend = orinoco_pci_suspend,
> - .resume = orinoco_pci_resume,
> + .driver.pm = &orinoco_pci_pm_ops,
> };
>
> static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
> diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_pci.h b/drivers/net/wireless/intersil/orinoco/orinoco_pci.h
> index 43f5b9f5a0b0..d49d940864b4 100644
> --- a/drivers/net/wireless/intersil/orinoco/orinoco_pci.h
> +++ b/drivers/net/wireless/intersil/orinoco/orinoco_pci.h
> @@ -18,51 +18,37 @@ struct orinoco_pci_card {
> void __iomem *attr_io;
> };
>
> -#ifdef CONFIG_PM
> -static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
> +static int __maybe_unused orinoco_pci_suspend(struct device *dev_d)
> {
> + struct pci_dev *pdev = to_pci_dev(dev_d);
> struct orinoco_private *priv = pci_get_drvdata(pdev);
>
> orinoco_down(priv);
> free_irq(pdev->irq, priv);
> - pci_save_state(pdev);
> - pci_disable_device(pdev);
> - pci_set_power_state(pdev, PCI_D3hot);
>
> return 0;
> }
>
> -static int orinoco_pci_resume(struct pci_dev *pdev)
> +static int __maybe_unused orinoco_pci_resume(struct device *dev_d)
> {
> + struct pci_dev *pdev = to_pci_dev(dev_d);
> struct orinoco_private *priv = pci_get_drvdata(pdev);
> struct net_device *dev = priv->ndev;
> int err;
>
> - pci_set_power_state(pdev, PCI_D0);
> - err = pci_enable_device(pdev);
> - if (err) {
> - printk(KERN_ERR "%s: pci_enable_device failed on resume\n",
> - dev->name);
> - return err;
> - }
> - pci_restore_state(pdev);
> -
> err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
> dev->name, priv);
> if (err) {
> printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",
> dev->name);
> - pci_disable_device(pdev);
> return -EBUSY;
> }
>
> - err = orinoco_up(priv);
> -
> - return err;
> + return orinoco_up(priv);
> }
> -#else
> -#define orinoco_pci_suspend NULL
> -#define orinoco_pci_resume NULL
> -#endif
> +
> +static SIMPLE_DEV_PM_OPS(orinoco_pci_pm_ops,
> + orinoco_pci_suspend,
> + orinoco_pci_resume);
>
> #endif /* _ORINOCO_PCI_H */
> diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_plx.c b/drivers/net/wireless/intersil/orinoco/orinoco_plx.c
> index 221352027779..16dada94c774 100644
> --- a/drivers/net/wireless/intersil/orinoco/orinoco_plx.c
> +++ b/drivers/net/wireless/intersil/orinoco/orinoco_plx.c
> @@ -336,8 +336,7 @@ static struct pci_driver orinoco_plx_driver = {
> .id_table = orinoco_plx_id_table,
> .probe = orinoco_plx_init_one,
> .remove = orinoco_plx_remove_one,
> - .suspend = orinoco_pci_suspend,
> - .resume = orinoco_pci_resume,
> + .driver.pm = &orinoco_pci_pm_ops,
> };
>
> static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
> diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c b/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c
> index 20ce569b8a43..9a9d335611ac 100644
> --- a/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c
> +++ b/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c
> @@ -213,8 +213,7 @@ static struct pci_driver orinoco_tmd_driver = {
> .id_table = orinoco_tmd_id_table,
> .probe = orinoco_tmd_init_one,
> .remove = orinoco_tmd_remove_one,
> - .suspend = orinoco_pci_suspend,
> - .resume = orinoco_pci_resume,
> + .driver.pm = &orinoco_pci_pm_ops,
> };
>
> static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
> --
> 2.27.0
>
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next prev parent reply other threads:[~2020-07-01 6:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 17:40 [Linux-kernel-mentees] [PATCH v1] orinoco: use generic power management Vaibhav Gupta
2020-07-01 5:45 ` Vaibhav Gupta [this message]
2020-07-15 10:38 ` Kalle Valo
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=CAPBsFfCGfyFkeVvUC0QCnr9J4uvfubHoHjgPR9e+muPkYRj9vg@mail.gmail.com \
--to=vaibhav.varodek@gmail.com \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=helgaas@kernel.org \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vaibhavgupta40@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).