misc/pvpanic: deduplicate common code

pvpanic-mmio.c and pvpanic-pci.c share a lot of code.
Refactor it into pvpanic.c where it doesn't have to be kept in sync
manually and where the core logic can be understood more easily.

No functional change.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20231011-pvpanic-cleanup-v2-1-4b21d56f779f@weissschuh.net
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 eb97167c03fb4b978f1966bb1d0d2fe6abdf7698..9715798acce3de2142c433e8b57cbdd804d5b10d 100644 (file)
--- a/drivers/misc/pvpanic/pvpanic-mmio.c
+++ b/drivers/misc/pvpanic/pvpanic-mmio.c
@@ -24,52 +24,9 @@ MODULE_AUTHOR("Hu Tao <hutao@cn.fujitsu.com>");
 MODULE_DESCRIPTION("pvpanic-mmio device driver");
 MODULE_LICENSE("GPL");
 
-static ssize_t capability_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct pvpanic_instance *pi = dev_get_drvdata(dev);
-
-       return sysfs_emit(buf, "%x\n", pi->capability);
-}
-static DEVICE_ATTR_RO(capability);
-
-static ssize_t events_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct pvpanic_instance *pi = dev_get_drvdata(dev);
-
-       return sysfs_emit(buf, "%x\n", pi->events);
-}
-
-static ssize_t events_store(struct device *dev, struct device_attribute *attr,
-                           const char *buf, size_t count)
-{
-       struct pvpanic_instance *pi = dev_get_drvdata(dev);
-       unsigned int tmp;
-       int err;
-
-       err = kstrtouint(buf, 16, &tmp);
-       if (err)
-               return err;
-
-       if ((tmp & pi->capability) != tmp)
-               return -EINVAL;
-
-       pi->events = tmp;
-
-       return count;
-}
-static DEVICE_ATTR_RW(events);
-
-static struct attribute *pvpanic_mmio_dev_attrs[] = {
-       &dev_attr_capability.attr,
-       &dev_attr_events.attr,
-       NULL
-};
-ATTRIBUTE_GROUPS(pvpanic_mmio_dev);
-
 static int pvpanic_mmio_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct pvpanic_instance *pi;
        struct resource *res;
        void __iomem *base;
 
@@ -92,18 +49,7 @@ static int pvpanic_mmio_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       pi = devm_kmalloc(dev, sizeof(*pi), GFP_KERNEL);
-       if (!pi)
-               return -ENOMEM;
-
-       pi->base = base;
-       pi->capability = PVPANIC_PANICKED | PVPANIC_CRASH_LOADED;
-
-       /* initialize capability by RDPT */
-       pi->capability &= ioread8(base);
-       pi->events = pi->capability;
-
-       return devm_pvpanic_probe(dev, pi);
+       return devm_pvpanic_probe(dev, base);
 }
 
 static const struct of_device_id pvpanic_mmio_match[] = {
@@ -123,7 +69,7 @@ static struct platform_driver pvpanic_mmio_driver = {
                .name = "pvpanic-mmio",
                .of_match_table = pvpanic_mmio_match,
                .acpi_match_table = pvpanic_device_ids,
-               .dev_groups = pvpanic_mmio_dev_groups,
+               .dev_groups = pvpanic_dev_groups,
        },
        .probe = pvpanic_mmio_probe,
 };

diff --git a/drivers/misc/pvpanic/pvpanic-pci.c b/drivers/misc/pvpanic/pvpanic-pci.c
index 07eddb5ea30fa14bd84e508b7cd7020236f43e21..689af4c28c2a9cd8822cbaac5e44c9525f56c5a0 100644 (file)
--- a/drivers/misc/pvpanic/pvpanic-pci.c
+++ b/drivers/misc/pvpanic/pvpanic-pci.c
@@ -22,51 +22,8 @@ MODULE_AUTHOR("Mihai Carabas <mihai.carabas@oracle.com>");
 MODULE_DESCRIPTION("pvpanic device driver");
 MODULE_LICENSE("GPL");
 
-static ssize_t capability_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct pvpanic_instance *pi = dev_get_drvdata(dev);
-
-       return sysfs_emit(buf, "%x\n", pi->capability);
-}
-static DEVICE_ATTR_RO(capability);
-
-static ssize_t events_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct pvpanic_instance *pi = dev_get_drvdata(dev);
-
-       return sysfs_emit(buf, "%x\n", pi->events);
-}
-
-static ssize_t events_store(struct device *dev, struct device_attribute *attr,
-                           const char *buf, size_t count)
-{
-       struct pvpanic_instance *pi = dev_get_drvdata(dev);
-       unsigned int tmp;
-       int err;
-
-       err = kstrtouint(buf, 16, &tmp);
-       if (err)
-               return err;
-
-       if ((tmp & pi->capability) != tmp)
-               return -EINVAL;
-
-       pi->events = tmp;
-
-       return count;
-}
-static DEVICE_ATTR_RW(events);
-
-static struct attribute *pvpanic_pci_dev_attrs[] = {
-       &dev_attr_capability.attr,
-       &dev_attr_events.attr,
-       NULL
-};
-ATTRIBUTE_GROUPS(pvpanic_pci_dev);
-
 static int pvpanic_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-       struct pvpanic_instance *pi;
        void __iomem *base;
        int ret;
 
@@ -78,18 +35,7 @@ static int pvpanic_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
        if (!base)
                return -ENOMEM;
 
-       pi = devm_kmalloc(&pdev->dev, sizeof(*pi), GFP_KERNEL);
-       if (!pi)
-               return -ENOMEM;
-
-       pi->base = base;
-       pi->capability = PVPANIC_PANICKED | PVPANIC_CRASH_LOADED;
-
-       /* initlize capability by RDPT */
-       pi->capability &= ioread8(base);
-       pi->events = pi->capability;
-
-       return devm_pvpanic_probe(&pdev->dev, pi);
+       return devm_pvpanic_probe(&pdev->dev, base);
 }
 
 static const struct pci_device_id pvpanic_pci_id_tbl[]  = {
@@ -103,7 +49,7 @@ static struct pci_driver pvpanic_pci_driver = {
        .id_table =     pvpanic_pci_id_tbl,
        .probe =        pvpanic_pci_probe,
        .driver = {
-               .dev_groups = pvpanic_pci_dev_groups,
+               .dev_groups = pvpanic_dev_groups,
        },
 };
 module_pci_driver(pvpanic_pci_driver);

diff --git a/drivers/misc/pvpanic/pvpanic.c b/drivers/misc/pvpanic/pvpanic.c
index 049a12006348902aef16e3e383c3ccaa871c8ea4..305b367e0ce34618c1e465f85e56c1cc1cb61746 100644 (file)
--- a/drivers/misc/pvpanic/pvpanic.c
+++ b/drivers/misc/pvpanic/pvpanic.c
@@ -7,6 +7,7 @@
  *  Copyright (C) 2021 Oracle.
  */
 
+#include <linux/device.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/kexec.h>
@@ -26,6 +27,13 @@ MODULE_AUTHOR("Mihai Carabas <mihai.carabas@oracle.com>");
 MODULE_DESCRIPTION("pvpanic device driver");
 MODULE_LICENSE("GPL");
 
+struct pvpanic_instance {
+       void __iomem *base;
+       unsigned int capability;
+       unsigned int events;
+       struct list_head list;
+};
+
 static struct list_head pvpanic_list;
 static spinlock_t pvpanic_lock;
 
@@ -81,11 +89,75 @@ static void pvpanic_remove(void *param)
        spin_unlock(&pvpanic_lock);
 }
 
-int devm_pvpanic_probe(struct device *dev, struct pvpanic_instance *pi)
+static ssize_t capability_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+       struct pvpanic_instance *pi = dev_get_drvdata(dev);
+
+       return sysfs_emit(buf, "%x\n", pi->capability);
+}
+static DEVICE_ATTR_RO(capability);
+
+static ssize_t events_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+       struct pvpanic_instance *pi = dev_get_drvdata(dev);
+
+       return sysfs_emit(buf, "%x\n", pi->events);
+}
+
+static ssize_t events_store(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+       struct pvpanic_instance *pi = dev_get_drvdata(dev);
+       unsigned int tmp;
+       int err;
+
+       err = kstrtouint(buf, 16, &tmp);
+       if (err)
+               return err;
+
+       if ((tmp & pi->capability) != tmp)
+               return -EINVAL;
+
+       pi->events = tmp;
+
+       return count;
+}
+static DEVICE_ATTR_RW(events);
+
+static struct attribute *pvpanic_dev_attrs[] = {
+       &dev_attr_capability.attr,
+       &dev_attr_events.attr,
+       NULL
+};
+
+static const struct attribute_group pvpanic_dev_group = {
+       .attrs = pvpanic_dev_attrs,
+};
+
+const struct attribute_group *pvpanic_dev_groups[] = {
+       &pvpanic_dev_group,
+       NULL
+};
+EXPORT_SYMBOL_GPL(pvpanic_dev_groups);
+
+int devm_pvpanic_probe(struct device *dev, void __iomem *base)
 {
-       if (!pi || !pi->base)
+       struct pvpanic_instance *pi;
+
+       if (!base)
                return -EINVAL;
 
+       pi = devm_kmalloc(dev, sizeof(*pi), GFP_KERNEL);
+       if (!pi)
+               return -ENOMEM;
+
+       pi->base = base;
+       pi->capability = PVPANIC_PANICKED | PVPANIC_CRASH_LOADED;
+
+       /* initlize capability by RDPT */
+       pi->capability &= ioread8(base);
+       pi->events = pi->capability;
+
        spin_lock(&pvpanic_lock);
        list_add(&pi->list, &pvpanic_list);
        spin_unlock(&pvpanic_lock);

diff --git a/drivers/misc/pvpanic/pvpanic.h b/drivers/misc/pvpanic/pvpanic.h
index 4935459517548762645f2c0f1ba08241852af0d5..46ffb10438adf618d0cf6758f2a2237bcaaf1ac3 100644 (file)
--- a/drivers/misc/pvpanic/pvpanic.h
+++ b/drivers/misc/pvpanic/pvpanic.h
@@ -8,13 +8,7 @@
 #ifndef PVPANIC_H_
 #define PVPANIC_H_
 
-struct pvpanic_instance {
-       void __iomem *base;
-       unsigned int capability;
-       unsigned int events;
-       struct list_head list;
-};
-
-int devm_pvpanic_probe(struct device *dev, struct pvpanic_instance *pi);
+int devm_pvpanic_probe(struct device *dev, void __iomem *base);
+extern const struct attribute_group *pvpanic_dev_groups[];
 
 #endif /* PVPANIC_H_ */