Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19338530 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Linus Walleij
Browse files

gpio: generic: Use platform_device_id->driver_data field for driver flags 



Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8c1d50a6

drivers/gpio/gpio-generic.c

+9 −7
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int bgpio_pdev_probe(struct platform_device *pdev) 
	void __iomem *dirout;

	void __iomem *dirin;

	unsigned long sz;

	unsigned long flags = 0;

	unsigned long flags = pdev->id_entry->driver_data;

	int err;

	struct bgpio_chip *bgc;

	struct bgpio_pdata *pdata = dev_get_platdata(dev);
@@ -519,9 +519,6 @@ static int bgpio_pdev_probe(struct platform_device *pdev) 
	if (err)

		return err;



	if (!strcmp(platform_get_device_id(pdev)->name, "basic-mmio-gpio-be"))

		flags |= BGPIOF_BIG_ENDIAN;



	bgc = devm_kzalloc(&pdev->dev, sizeof(*bgc), GFP_KERNEL);

	if (!bgc)

		return -ENOMEM;
@@ -551,9 +548,14 @@ static int bgpio_pdev_remove(struct platform_device *pdev) 
}



static const struct platform_device_id bgpio_id_table[] = {

	{ "basic-mmio-gpio", },

	{ "basic-mmio-gpio-be", },

	{},

	{

		.name		= "basic-mmio-gpio",

		.driver_data	= 0,

	}, {

		.name		= "basic-mmio-gpio-be",

		.driver_data	= BGPIOF_BIG_ENDIAN,

	},

	{ }

};

MODULE_DEVICE_TABLE(platform, bgpio_id_table);