Commit fd54d65d authored by Lubomir Rintel's avatar Lubomir Rintel Committed by Lee Jones
Browse files

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: default avatarLubomir Rintel <lkundrak@v3.sk>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent b1c83bd8

drivers/mfd/cs5535-mfd.c

+7 −17
Original line number Diff line number Diff line
@@ -112,23 +112,11 @@ static struct mfd_cell cs5535_mfd_cells[] = { 
	},

};



#ifdef CONFIG_OLPC

static void cs5535_clone_olpc_cells(void)

{

	static const char *acpi_clones[] = {

static const char *olpc_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 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));