summaryrefslogtreecommitdiff
path: root/drivers/mfd/cs5535-mfd.c
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-06-20 14:19:57 +0300
committerLee Jones <lee.jones@linaro.org>2019-07-02 14:11:31 +0300
commitfd54d65dd4578320d1c3505acffa3e0154a9fe5d (patch)
tree024b9fd347e469334a27d0f0cac7e07bcc92e7c5 /drivers/mfd/cs5535-mfd.c
parentb1c83bd84618e5a3ec6395845d11803047a3ef9a (diff)
downloadlinux-fd54d65dd4578320d1c3505acffa3e0154a9fe5d.tar.xz
mfd: cs5535-mfd: Remove ifdef OLPC noise
<asm/olpc.h> provides machine_is_olpc() stub for CONFIG_OLPC=n, compiler should just optimize the unneeded bits away. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/cs5535-mfd.c')
-rw-r--r--drivers/mfd/cs5535-mfd.c24
1 files changed, 7 insertions, 17 deletions
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index f9d277ff4aaf..2e77b6147baa 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -112,22 +112,10 @@ static struct mfd_cell cs5535_mfd_cells[] = {
},
};
-#ifdef CONFIG_OLPC
-static void cs5535_clone_olpc_cells(void)
-{
- static const char *acpi_clones[] = {
- "olpc-xo1-pm-acpi",
- "olpc-xo1-sci-acpi"
- };
-
- if (!machine_is_olpc())
- return;
-
- mfd_clone_cell("cs5535-acpi", acpi_clones, ARRAY_SIZE(acpi_clones));
-}
-#else
-static void cs5535_clone_olpc_cells(void) { }
-#endif
+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)
@@ -157,7 +145,9 @@ static int cs5535_mfd_probe(struct pci_dev *pdev,
dev_err(&pdev->dev, "MFD add devices failed: %d\n", err);
goto err_disable;
}
- cs5535_clone_olpc_cells();
+
+ if (machine_is_olpc())
+ mfd_clone_cell("cs5535-acpi", olpc_acpi_clones, ARRAY_SIZE(olpc_acpi_clones));
dev_info(&pdev->dev, "%zu devices registered.\n",
ARRAY_SIZE(cs5535_mfd_cells));