lkml.org 
[lkml]   [2022]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 6/8] agp/amd64: Update to DEFINE_SIMPLE_DEV_PM_OPS()
    Date
    From: Bjorn Helgaas <bhelgaas@google.com>

    As of 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old
    ones"), SIMPLE_DEV_PM_OPS() is deprecated in favor of
    DEFINE_SIMPLE_DEV_PM_OPS(), which has the advantage that the PM callbacks
    don't need to be wrapped with #ifdef CONFIG_PM or tagged with
    __maybe_unused.

    Convert to DEFINE_SIMPLE_DEV_PM_OPS(). No functional change intended.

    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    ---
    drivers/char/agp/amd64-agp.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
    index 84a4aa9312cf..ce8651436609 100644
    --- a/drivers/char/agp/amd64-agp.c
    +++ b/drivers/char/agp/amd64-agp.c
    @@ -588,9 +588,7 @@ static void agp_amd64_remove(struct pci_dev *pdev)
    agp_bridges_found--;
    }

    -#define agp_amd64_suspend NULL
    -
    -static int __maybe_unused agp_amd64_resume(struct device *dev)
    +static int agp_amd64_resume(struct device *dev)
    {
    struct pci_dev *pdev = to_pci_dev(dev);

    @@ -727,7 +725,7 @@ static const struct pci_device_id agp_amd64_pci_promisc_table[] = {
    { }
    };

    -static SIMPLE_DEV_PM_OPS(agp_amd64_pm_ops, agp_amd64_suspend, agp_amd64_resume);
    +static DEFINE_SIMPLE_DEV_PM_OPS(agp_amd64_pm_ops, NULL, agp_amd64_resume);

    static struct pci_driver agp_amd64_pci_driver = {
    .name = "agpgart-amd64",
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-10-25 22:40    [W:6.970 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site