From: Bjorn Helgaas <helgaas@kernel.org>
To: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Cc: rjw@rjwysocki.net, linux-kernel-mentees@lists.linuxfoundation.org
Subject: Re: [Linux-kernel-mentees] [PATCH v1 1/2] realtek/8139too: Remove Legacy Power Management
Date: Thu, 23 Apr 2020 22:43:45 -0500 [thread overview]
Message-ID: <20200424034345.GA34450@google.com> (raw)
In-Reply-To: <20200423132759.38191-1-vaibhavgupta40@gmail.com>
If you post more that one patch in a series, it's best if you include
a cover letter with the patches being responses to the cover letter.
In this case, it would be:
[0/2] cover letter
-> [1/2] realtek/8139too: Remove ...
-> [2/2] realtek/8139cp: Remove ...
On Thu, Apr 23, 2020 at 06:57:59PM +0530, Vaibhav Gupta wrote:
> Upgrade Power Management from legacy to generic using dev_pm_ops.
>
> Remove struct pci_driver.suspend and struct pci_driver.resume bindings,
> and add struct pci_driver.driver.pm .
>
> Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
> ---
> drivers/net/ethernet/realtek/8139too.c | 26 +++++++-------------------
> 1 file changed, 7 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
> index 5caeb8368eab..b7c98b165256 100644
> --- a/drivers/net/ethernet/realtek/8139too.c
> +++ b/drivers/net/ethernet/realtek/8139too.c
> @@ -2603,17 +2603,13 @@ static void rtl8139_set_rx_mode (struct net_device *dev)
> spin_unlock_irqrestore (&tp->lock, flags);
> }
>
> -#ifdef CONFIG_PM
> -
> -static int rtl8139_suspend (struct pci_dev *pdev, pm_message_t state)
> +static int rtl8139_suspend(struct device *device)
> {
> - struct net_device *dev = pci_get_drvdata (pdev);
> + struct net_device *dev = dev_get_drvdata(device);
> struct rtl8139_private *tp = netdev_priv(dev);
> void __iomem *ioaddr = tp->mmio_addr;
> unsigned long flags;
>
> - pci_save_state (pdev);
> -
> if (!netif_running (dev))
> return 0;
>
> @@ -2631,38 +2627,30 @@ static int rtl8139_suspend (struct pci_dev *pdev, pm_message_t state)
>
> spin_unlock_irqrestore (&tp->lock, flags);
>
> - pci_set_power_state (pdev, PCI_D3hot);
> -
> return 0;
> }
>
> -
> -static int rtl8139_resume (struct pci_dev *pdev)
> +static int rtl8139_resume(struct device *device)
> {
> - struct net_device *dev = pci_get_drvdata (pdev);
> + struct net_device *dev = dev_get_drvdata(device);
>
> - pci_restore_state (pdev);
> if (!netif_running (dev))
> return 0;
> - pci_set_power_state (pdev, PCI_D0);
> +
> rtl8139_init_ring (dev);
> rtl8139_hw_start (dev);
> netif_device_attach (dev);
> return 0;
> }
>
> -#endif /* CONFIG_PM */
> -
> +static SIMPLE_DEV_PM_OPS(rtl8139_pm_ops, rtl8139_suspend, rtl8139_resume);
The common pattern here seems to be:
#ifdef CONFIG_PM_SLEEP
static int *_suspend(struct device *device) { ... }
static int *_resume(struct device *device) { ... }
#endif
static SIMPLE_DEV_PM_OPS(*_pm_ops, *_suspend, *_resume);
So your patch looks great except that I think you should keep the
#ifdef and convert it to CONFIG_PM_SLEEP.
> static struct pci_driver rtl8139_pci_driver = {
> .name = DRV_NAME,
> .id_table = rtl8139_pci_tbl,
> .probe = rtl8139_init_one,
> .remove = rtl8139_remove_one,
> -#ifdef CONFIG_PM
> - .suspend = rtl8139_suspend,
> - .resume = rtl8139_resume,
> -#endif /* CONFIG_PM */
> + .driver.pm = &rtl8139_pm_ops,
> };
>
>
> --
> 2.26.2
>
_______________________________________________
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-04-24 3:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 13:27 [Linux-kernel-mentees] [PATCH v1 1/2] realtek/8139too: Remove Legacy Power Management Vaibhav Gupta
2020-04-23 13:28 ` [Linux-kernel-mentees] [PATCH v1 2/2] realtek/8139cp: " Vaibhav Gupta
2020-04-24 3:47 ` Bjorn Helgaas
2020-04-24 10:31 ` Vaibhav Gupta
2020-04-24 12:44 ` Bjorn Helgaas
2020-04-24 13:00 ` Vaibhav Gupta
2020-04-24 13:59 ` Bjorn Helgaas
2020-04-24 14:04 ` Vaibhav Gupta
2020-04-24 15:01 ` Bjorn Helgaas
2020-04-24 15:13 ` Vaibhav Gupta
2020-04-24 3:43 ` Bjorn Helgaas [this message]
2020-04-24 10:00 ` [Linux-kernel-mentees] [PATCH v1 1/2] realtek/8139too: " Vaibhav Gupta
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=20200424034345.GA34450@google.com \
--to=helgaas@kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=rjw@rjwysocki.net \
--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).