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

Commit c838cb3d authored by Jingoo Han's avatar Jingoo Han Committed by Dmitry Torokhov
Browse files

Input: use dev_get_platdata() 



Use the wrapper function for retrieving the platform data instead
of accessing dev->platform_data directly. This is a cosmetic change
to make the code simpler and enhance the readability.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarFugang Duan <B38611@freescale.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 54f05e95

drivers/input/keyboard/adp5520-keys.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int adp5520_keys_notifier(struct notifier_block *nb, 


static int adp5520_keys_probe(struct platform_device *pdev)

{

	struct adp5520_keys_platform_data *pdata = pdev->dev.platform_data;

	struct adp5520_keys_platform_data *pdata = dev_get_platdata(&pdev->dev);

	struct input_dev *input;

	struct adp5520_keys *dev;

	int ret, i;

drivers/input/keyboard/adp5588-keys.c

+6 −4
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static int adp5588_build_gpiomap(struct adp5588_kpad *kpad, 
static int adp5588_gpio_add(struct adp5588_kpad *kpad)

{

	struct device *dev = &kpad->client->dev;

	const struct adp5588_kpad_platform_data *pdata = dev->platform_data;

	const struct adp5588_kpad_platform_data *pdata = dev_get_platdata(dev);

	const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data;

	int i, error;
@@ -227,7 +227,7 @@ static int adp5588_gpio_add(struct adp5588_kpad *kpad) 
static void adp5588_gpio_remove(struct adp5588_kpad *kpad)

{

	struct device *dev = &kpad->client->dev;

	const struct adp5588_kpad_platform_data *pdata = dev->platform_data;

	const struct adp5588_kpad_platform_data *pdata = dev_get_platdata(dev);

	const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data;

	int error;
@@ -321,7 +321,8 @@ static irqreturn_t adp5588_irq(int irq, void *handle) 


static int adp5588_setup(struct i2c_client *client)

{

	const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;

	const struct adp5588_kpad_platform_data *pdata =

			dev_get_platdata(&client->dev);

	const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data;

	int i, ret;

	unsigned char evt_mode1 = 0, evt_mode2 = 0, evt_mode3 = 0;
@@ -424,7 +425,8 @@ static int adp5588_probe(struct i2c_client *client, 
			 const struct i2c_device_id *id)

{

	struct adp5588_kpad *kpad;

	const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;

	const struct adp5588_kpad_platform_data *pdata =

			dev_get_platdata(&client->dev);

	struct input_dev *input;

	unsigned int revid;

	int ret, i;

drivers/input/keyboard/adp5589-keys.c

+4 −4
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static int adp5589_build_gpiomap(struct adp5589_kpad *kpad, 
static int adp5589_gpio_add(struct adp5589_kpad *kpad)

{

	struct device *dev = &kpad->client->dev;

	const struct adp5589_kpad_platform_data *pdata = dev->platform_data;

	const struct adp5589_kpad_platform_data *pdata = dev_get_platdata(dev);

	const struct adp5589_gpio_platform_data *gpio_data = pdata->gpio_data;

	int i, error;
@@ -553,7 +553,7 @@ static int adp5589_gpio_add(struct adp5589_kpad *kpad) 
static void adp5589_gpio_remove(struct adp5589_kpad *kpad)

{

	struct device *dev = &kpad->client->dev;

	const struct adp5589_kpad_platform_data *pdata = dev->platform_data;

	const struct adp5589_kpad_platform_data *pdata = dev_get_platdata(dev);

	const struct adp5589_gpio_platform_data *gpio_data = pdata->gpio_data;

	int error;
@@ -658,7 +658,7 @@ static int adp5589_setup(struct adp5589_kpad *kpad) 
{

	struct i2c_client *client = kpad->client;

	const struct adp5589_kpad_platform_data *pdata =

		client->dev.platform_data;

		dev_get_platdata(&client->dev);

	u8 (*reg) (u8) = kpad->var->reg;

	unsigned char evt_mode1 = 0, evt_mode2 = 0, evt_mode3 = 0;

	unsigned char pull_mask = 0;
@@ -864,7 +864,7 @@ static int adp5589_probe(struct i2c_client *client, 
{

	struct adp5589_kpad *kpad;

	const struct adp5589_kpad_platform_data *pdata =

		client->dev.platform_data;

		dev_get_platdata(&client->dev);

	struct input_dev *input;

	unsigned int revid;

	int ret, i;

drivers/input/keyboard/bf54x-keys.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static irqreturn_t bfin_kpad_isr(int irq, void *dev_id) 
static int bfin_kpad_probe(struct platform_device *pdev)

{

	struct bf54x_kpad *bf54x_kpad;

	struct bfin_kpad_platform_data *pdata = pdev->dev.platform_data;

	struct bfin_kpad_platform_data *pdata = dev_get_platdata(&pdev->dev);

	struct input_dev *input;

	int i, error;
@@ -332,7 +332,7 @@ out: 


static int bfin_kpad_remove(struct platform_device *pdev)

{

	struct bfin_kpad_platform_data *pdata = pdev->dev.platform_data;

	struct bfin_kpad_platform_data *pdata = dev_get_platdata(&pdev->dev);

	struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);



	del_timer_sync(&bf54x_kpad->timer);

drivers/input/keyboard/davinci_keyscan.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int __init davinci_ks_probe(struct platform_device *pdev) 
	struct input_dev *key_dev;

	struct resource *res, *mem;

	struct device *dev = &pdev->dev;

	struct davinci_ks_platform_data *pdata = pdev->dev.platform_data;

	struct davinci_ks_platform_data *pdata = dev_get_platdata(&pdev->dev);

	int error, i;



	if (pdata->device_enable) {