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

Commit 66afdedf authored by Linus Walleij's avatar Linus Walleij Committed by Chanwoo Choi
Browse files

extcon: gpio: Localize platform data 



Nothing in the entire kernel #includes <linux/extcon/extcon-gpio.h>
so move the platform data declaration inside of the driver.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent eca0f13c

drivers/extcon/extcon-gpio.c

+21 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
 */



#include <linux/extcon-provider.h>

#include <linux/extcon/extcon-gpio.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/init.h>
@@ -29,6 +28,27 @@ 
#include <linux/slab.h>

#include <linux/workqueue.h>



/**

 * struct gpio_extcon_pdata - A simple GPIO-controlled extcon device.

 * @extcon_id:		The unique id of specific external connector.

 * @gpio:		Corresponding GPIO.

 * @gpio_active_low:	Boolean describing whether gpio active state is 1 or 0

 *			If true, low state of gpio means active.

 *			If false, high state of gpio means active.

 * @debounce:		Debounce time for GPIO IRQ in ms.

 * @irq_flags:		IRQ Flags (e.g., IRQF_TRIGGER_LOW).

 * @check_on_resume:	Boolean describing whether to check the state of gpio

 *			while resuming from sleep.

 */

struct gpio_extcon_pdata {

	unsigned int extcon_id;

	unsigned gpio;

	bool gpio_active_low;

	unsigned long debounce;

	unsigned long irq_flags;

	bool check_on_resume;

};



struct gpio_extcon_data {

	struct extcon_dev *edev;

	int irq;

include/linux/extcon/extcon-gpio.h

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/*

 * Single-state GPIO extcon driver based on extcon class

 *

 * Copyright (C) 2012 Samsung Electronics

 * Author: MyungJoo Ham <myungjoo.ham@samsung.com>

 *

 * based on switch class driver

 * Copyright (C) 2008 Google, Inc.

 * Author: Mike Lockwood <lockwood@android.com>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

#ifndef __EXTCON_GPIO_H__

#define __EXTCON_GPIO_H__ __FILE__



#include <linux/extcon.h>



/**

 * struct gpio_extcon_pdata - A simple GPIO-controlled extcon device.

 * @extcon_id:		The unique id of specific external connector.

 * @gpio:		Corresponding GPIO.

 * @gpio_active_low:	Boolean describing whether gpio active state is 1 or 0

 *			If true, low state of gpio means active.

 *			If false, high state of gpio means active.

 * @debounce:		Debounce time for GPIO IRQ in ms.

 * @irq_flags:		IRQ Flags (e.g., IRQF_TRIGGER_LOW).

 * @check_on_resume:	Boolean describing whether to check the state of gpio

 *			while resuming from sleep.

 */

struct gpio_extcon_pdata {

	unsigned int extcon_id;

	unsigned gpio;

	bool gpio_active_low;

	unsigned long debounce;

	unsigned long irq_flags;



	bool check_on_resume;

};



#endif /* __EXTCON_GPIO_H__ */