hwmon: (w83627ehf) Use platform_create_bundle

Using platform_create_bundle() simplifies the module
init code and allows w83627ehf_probe() to be marked
as __init, lowering the runtime memory footprint.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20210709184501.6546-2-W_Armin@gmx.de
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 8618aaf32350e2517d155225f2b3d177deba1f30..16aed90ca2ec658e6d4b7592fd4e1ea225fc254d 100644 (file)
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1694,7 +1694,7 @@ static const struct hwmon_chip_info w83627ehf_chip_info = {
        .info = w83627ehf_info,
 };
 
-static int w83627ehf_probe(struct platform_device *pdev)
+static int __init w83627ehf_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
@@ -2057,7 +2057,6 @@ static struct platform_driver w83627ehf_driver = {
                .name   = DRVNAME,
                .pm     = W83627EHF_DEV_PM_OPS,
        },
-       .probe          = w83627ehf_probe,
        .remove         = w83627ehf_remove,
 };
 
@@ -2150,8 +2149,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
 /*
  * when Super-I/O functions move to a separate file, the Super-I/O
  * bus will manage the lifetime of the device and this module will only keep
- * track of the w83627ehf driver. But since we platform_device_alloc(), we
- * must keep track of the device
+ * track of the w83627ehf driver.
  */
 static struct platform_device *pdev;
 
@@ -2159,7 +2157,10 @@ static int __init sensors_w83627ehf_init(void)
 {
        int err;
        unsigned short address;
-       struct resource res;
+       struct resource res = {
+               .name   = DRVNAME,
+               .flags  = IORESOURCE_IO,
+       };
        struct w83627ehf_sio_data sio_data;
 
        /*
@@ -2173,55 +2174,17 @@ static int __init sensors_w83627ehf_init(void)
            w83627ehf_find(0x4e, &address, &sio_data))
                return -ENODEV;
 
-       err = platform_driver_register(&w83627ehf_driver);
-       if (err)
-               goto exit;
-
-       pdev = platform_device_alloc(DRVNAME, address);
-       if (!pdev) {
-               err = -ENOMEM;
-               pr_err("Device allocation failed\n");
-               goto exit_unregister;
-       }
-
-       err = platform_device_add_data(pdev, &sio_data,
-                                      sizeof(struct w83627ehf_sio_data));
-       if (err) {
-               pr_err("Platform data allocation failed\n");
-               goto exit_device_put;
-       }
-
-       memset(&res, 0, sizeof(res));
-       res.name = DRVNAME;
        res.start = address + IOREGION_OFFSET;
        res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1;
-       res.flags = IORESOURCE_IO;
 
        err = acpi_check_resource_conflict(&res);
        if (err)
-               goto exit_device_put;
+               return err;
 
-       err = platform_device_add_resources(pdev, &res, 1);
-       if (err) {
-               pr_err("Device resource addition failed (%d)\n", err);
-               goto exit_device_put;
-       }
+       pdev = platform_create_bundle(&w83627ehf_driver, w83627ehf_probe, &res, 1, &sio_data,
+                                     sizeof(struct w83627ehf_sio_data));
 
-       /* platform_device_add calls probe() */
-       err = platform_device_add(pdev);
-       if (err) {
-               pr_err("Device addition failed (%d)\n", err);
-               goto exit_device_put;
-       }
-
-       return 0;
-
-exit_device_put:
-       platform_device_put(pdev);
-exit_unregister:
-       platform_driver_unregister(&w83627ehf_driver);
-exit:
-       return err;
+       return PTR_ERR_OR_ZERO(pdev);
 }
 
 static void __exit sensors_w83627ehf_exit(void)