misc/pvpanic: Make 'pvpanic_probe()' resource managed

Simplify code and turn 'pvpanic_probe()' into a managed resource version.
This simplify callers that don't need to do some clean-up on error in the
probe and on remove.

Update pvpanic-mmio.c and pvpanic-pci.c accordingly.

'pvpanic_remove()' don't need to be exported anymore.

Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/9212cdc8c1e5c187a2f1129a6190085c2a10d28a.1621665058.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/pvpanic/pvpanic-mmio.c b/drivers/misc/pvpanic/pvpanic-mmio.c
index d4a407956c0743820bf3a94cf70df7cb7a8036c3..be401608497923995d1d8ef929e647c3aa8481c2 100644 (file)
--- a/drivers/misc/pvpanic/pvpanic-mmio.c
+++ b/drivers/misc/pvpanic/pvpanic-mmio.c
@@ -104,18 +104,7 @@ static int pvpanic_mmio_probe(struct platform_device *pdev)
        pi->capability &= ioread8(base);
        pi->events = pi->capability;
 
-       dev_set_drvdata(dev, pi);
-
-       return pvpanic_probe(pi);
-}
-
-static int pvpanic_mmio_remove(struct platform_device *pdev)
-{
-       struct pvpanic_instance *pi = dev_get_drvdata(&pdev->dev);
-
-       pvpanic_remove(pi);
-
-       return 0;
+       return devm_pvpanic_probe(dev, pi);
 }
 
 static const struct of_device_id pvpanic_mmio_match[] = {
@@ -138,6 +127,5 @@ static struct platform_driver pvpanic_mmio_driver = {
                .dev_groups = pvpanic_mmio_dev_groups,
        },
        .probe = pvpanic_mmio_probe,
-       .remove = pvpanic_mmio_remove,
 };
 module_platform_driver(pvpanic_mmio_driver);

diff --git a/drivers/misc/pvpanic/pvpanic-pci.c b/drivers/misc/pvpanic/pvpanic-pci.c
index 3d7f9efb3dd48ae64289455578cf3f5eb6a9b890..a43c401017ae2b3404fb890fd8b0b819a9f1ddf8 100644 (file)
--- a/drivers/misc/pvpanic/pvpanic-pci.c
+++ b/drivers/misc/pvpanic/pvpanic-pci.c
@@ -73,7 +73,6 @@ ATTRIBUTE_GROUPS(pvpanic_pci_dev);
 static int pvpanic_pci_probe(struct pci_dev *pdev,
                             const struct pci_device_id *ent)
 {
-       struct device *dev = &pdev->dev;
        struct pvpanic_instance *pi;
        void __iomem *base;
        int ret;
@@ -97,23 +96,13 @@ static int pvpanic_pci_probe(struct pci_dev *pdev,
        pi->capability &= ioread8(base);
        pi->events = pi->capability;
 
-       dev_set_drvdata(dev, pi);
-
-       return pvpanic_probe(pi);
-}
-
-static void pvpanic_pci_remove(struct pci_dev *pdev)
-{
-       struct pvpanic_instance *pi = dev_get_drvdata(&pdev->dev);
-
-       pvpanic_remove(pi);
+       return devm_pvpanic_probe(&pdev->dev, pi);
 }
 
 static struct pci_driver pvpanic_pci_driver = {
        .name =         "pvpanic-pci",
        .id_table =     pvpanic_pci_id_tbl,
        .probe =        pvpanic_pci_probe,
-       .remove =       pvpanic_pci_remove,
        .driver = {
                .dev_groups = pvpanic_pci_dev_groups,
        },

diff --git a/drivers/misc/pvpanic/pvpanic.c b/drivers/misc/pvpanic/pvpanic.c
index 65f70a4da8c077afb5ced0cc1b17f860588e93de..29f63a31edbc1d6cd6ba8c8f2de2e0a1801b7f13 100644 (file)
--- a/drivers/misc/pvpanic/pvpanic.c
+++ b/drivers/misc/pvpanic/pvpanic.c
@@ -60,22 +60,10 @@ static struct notifier_block pvpanic_panic_nb = {
        .priority = 1, /* let this called before broken drm_fb_helper */
 };
 
-int pvpanic_probe(struct pvpanic_instance *pi)
-{
-       if (!pi || !pi->base)
-               return -EINVAL;
-
-       spin_lock(&pvpanic_lock);
-       list_add(&pi->list, &pvpanic_list);
-       spin_unlock(&pvpanic_lock);
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(pvpanic_probe);
-
-void pvpanic_remove(struct pvpanic_instance *pi)
+static void pvpanic_remove(void *param)
 {
        struct pvpanic_instance *pi_cur, *pi_next;
+       struct pvpanic_instance *pi = param;
 
        if (!pi)
                return;
@@ -89,7 +77,19 @@ void pvpanic_remove(struct pvpanic_instance *pi)
        }
        spin_unlock(&pvpanic_lock);
 }
-EXPORT_SYMBOL_GPL(pvpanic_remove);
+
+int devm_pvpanic_probe(struct device *dev, struct pvpanic_instance *pi)
+{
+       if (!pi || !pi->base)
+               return -EINVAL;
+
+       spin_lock(&pvpanic_lock);
+       list_add(&pi->list, &pvpanic_list);
+       spin_unlock(&pvpanic_lock);
+
+       return devm_add_action_or_reset(dev, pvpanic_remove, pi);
+}
+EXPORT_SYMBOL_GPL(devm_pvpanic_probe);
 
 static int pvpanic_init(void)
 {

diff --git a/drivers/misc/pvpanic/pvpanic.h b/drivers/misc/pvpanic/pvpanic.h
index 1afccc2e9fec781cc940dc081abea05b5d7bc5bf..4935459517548762645f2c0f1ba08241852af0d5 100644 (file)
--- a/drivers/misc/pvpanic/pvpanic.h
+++ b/drivers/misc/pvpanic/pvpanic.h
@@ -15,7 +15,6 @@ struct pvpanic_instance {
        struct list_head list;
 };
 
-int pvpanic_probe(struct pvpanic_instance *pi);
-void pvpanic_remove(struct pvpanic_instance *pi);
+int devm_pvpanic_probe(struct device *dev, struct pvpanic_instance *pi);
 
 #endif /* PVPANIC_H_ */