Merge tag 'audit-pr-20200226' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

[linux.git] / drivers / mfd / cs5535-mfd.c

diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index f1825c0ccbd04ead1f03fc3b4188f952a4dca67c..d0fb2e52ee76a82ab18f668f41b10ac3f4e01ed3 100644 (file)
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -27,121 +27,106 @@ enum cs5535_mfd_bars {
        NR_BARS,
 };
 
-static int cs5535_mfd_res_enable(struct platform_device *pdev)
-{
-       struct resource *res;
-
-       res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "can't fetch device resource info\n");
-               return -EIO;
-       }
-
-       if (!request_region(res->start, resource_size(res), DRV_NAME)) {
-               dev_err(&pdev->dev, "can't request region\n");
-               return -EIO;
-       }
-
-       return 0;
-}
-
-static int cs5535_mfd_res_disable(struct platform_device *pdev)
-{
-       struct resource *res;
-
-       res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "can't fetch device resource info\n");
-               return -EIO;
-       }
-
-       release_region(res->start, resource_size(res));
-       return 0;
-}
-
 static struct resource cs5535_mfd_resources[NR_BARS];
 
 static struct mfd_cell cs5535_mfd_cells[] = {
        {
-               .id = SMB_BAR,
                .name = "cs5535-smb",
                .num_resources = 1,
                .resources = &cs5535_mfd_resources[SMB_BAR],
        },
        {
-               .id = GPIO_BAR,
                .name = "cs5535-gpio",
                .num_resources = 1,
                .resources = &cs5535_mfd_resources[GPIO_BAR],
        },
        {
-               .id = MFGPT_BAR,
                .name = "cs5535-mfgpt",
                .num_resources = 1,
                .resources = &cs5535_mfd_resources[MFGPT_BAR],
        },
        {
-               .id = PMS_BAR,
                .name = "cs5535-pms",
                .num_resources = 1,
                .resources = &cs5535_mfd_resources[PMS_BAR],
+       },
+};
 
-               .enable = cs5535_mfd_res_enable,
-               .disable = cs5535_mfd_res_disable,
+static struct mfd_cell cs5535_olpc_mfd_cells[] = {
+       {
+               .name = "olpc-xo1-pm-acpi",
+               .num_resources = 1,
+               .resources = &cs5535_mfd_resources[ACPI_BAR],
        },
        {
-               .id = ACPI_BAR,
-               .name = "cs5535-acpi",
+               .name = "olpc-xo1-sci-acpi",
                .num_resources = 1,
                .resources = &cs5535_mfd_resources[ACPI_BAR],
-
-               .enable = cs5535_mfd_res_enable,
-               .disable = cs5535_mfd_res_disable,
        },
 };
 
-static const char *olpc_acpi_clones[] = {
-       "olpc-xo1-pm-acpi",
-       "olpc-xo1-sci-acpi"
-};
-
 static int cs5535_mfd_probe(struct pci_dev *pdev,
                const struct pci_device_id *id)
 {
-       int err, i;
+       int err, bar;
 
        err = pci_enable_device(pdev);
        if (err)
                return err;
 
-       /* fill in IO range for each cell; subdrivers handle the region */
-       for (i = 0; i < ARRAY_SIZE(cs5535_mfd_cells); i++) {
-               int bar = cs5535_mfd_cells[i].id;
+       for (bar = 0; bar < NR_BARS; bar++) {
                struct resource *r = &cs5535_mfd_resources[bar];
 
                r->flags = IORESOURCE_IO;
                r->start = pci_resource_start(pdev, bar);
                r->end = pci_resource_end(pdev, bar);
+       }
 
-               /* id is used for temporarily storing BAR; unset it now */
-               cs5535_mfd_cells[i].id = 0;
+       err = pci_request_region(pdev, PMS_BAR, DRV_NAME);
+       if (err) {
+               dev_err(&pdev->dev, "Failed to request PMS_BAR's IO region\n");
+               goto err_disable;
        }
 
-       err = mfd_add_devices(&pdev->dev, -1, cs5535_mfd_cells,
+       err = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, cs5535_mfd_cells,
                              ARRAY_SIZE(cs5535_mfd_cells), NULL, 0, NULL);
        if (err) {
-               dev_err(&pdev->dev, "MFD add devices failed: %d\n", err);
-               goto err_disable;
+               dev_err(&pdev->dev,
+                       "Failed to add CS5535 sub-devices: %d\n", err);
+               goto err_release_pms;
        }
 
-       if (machine_is_olpc())
-               mfd_clone_cell("cs5535-acpi", olpc_acpi_clones, ARRAY_SIZE(olpc_acpi_clones));
+       if (machine_is_olpc()) {
+               err = pci_request_region(pdev, ACPI_BAR, DRV_NAME);
+               if (err) {
+                       dev_err(&pdev->dev,
+                               "Failed to request ACPI_BAR's IO region\n");
+                       goto err_remove_devices;
+               }
+
+               err = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE,
+                                     cs5535_olpc_mfd_cells,
+                                     ARRAY_SIZE(cs5535_olpc_mfd_cells),
+                                     NULL, 0, NULL);
+               if (err) {
+                       dev_err(&pdev->dev,
+                               "Failed to add CS5535 OLPC sub-devices: %d\n",
+                               err);
+                       goto err_release_acpi;
+               }
+       }
 
        dev_info(&pdev->dev, "%zu devices registered.\n",
                        ARRAY_SIZE(cs5535_mfd_cells));
 
        return 0;
 
+err_release_acpi:
+       pci_release_region(pdev, ACPI_BAR);
+err_remove_devices:
+       mfd_remove_devices(&pdev->dev);
+err_release_pms:
+       pci_release_region(pdev, PMS_BAR);
 err_disable:
        pci_disable_device(pdev);
        return err;
@@ -150,6 +135,11 @@ static int cs5535_mfd_probe(struct pci_dev *pdev,
 static void cs5535_mfd_remove(struct pci_dev *pdev)
 {
        mfd_remove_devices(&pdev->dev);
+
+       if (machine_is_olpc())
+               pci_release_region(pdev, ACPI_BAR);
+
+       pci_release_region(pdev, PMS_BAR);
        pci_disable_device(pdev);
 }