forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

extcon: remove EXTCON_PROP_USB_ID property

Browse source 
Fix commit 536277d550 ("FROMLIST: extcon: Add the support for
extcon property according to extcon type"), which introduce
EXTCON_PROP_USB_ID property, but upstream don't have such property.
Remove it make merge easy.

Change-Id: I7905049629aa85158b7e705b40018f83fa85a9ac
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
This commit is contained in:
Huang, Tao 2016-10-07 11:59:39 +08:00
commit f36cb4e3bf
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/linux/extcon.h
View file

@ -99,10 +99,6 @@
/*
* Properties of EXTCON_TYPE_USB.
*
* - EXTCON_PROP_USB_ID
* @type: integer (intval)
* @value: 0 (low) or 1 (high)
* @default: 0 (low)
* - EXTCON_PROP_USB_VBUS
* @type: integer (intval)
* @value: 0 (low) or 1 (high)
@ -112,12 +108,11 @@
* @value: 0 (normal) or 1 (flip)
* @default: 0 (normal)
*/
#define EXTCON_PROP_USB_ID 0
#define EXTCON_PROP_USB_VBUS 1
#define EXTCON_PROP_USB_TYPEC_POLARITY 2
#define EXTCON_PROP_USB_VBUS 0
#define EXTCON_PROP_USB_TYPEC_POLARITY 1
#define EXTCON_PROP_USB_MIN 0
#define EXTCON_PROP_USB_MAX 2
#define EXTCON_PROP_USB_MAX 1
#define EXTCON_PROP_USB_CNT (EXTCON_PROP_USB_MAX - EXTCON_PROP_USB_MIN + 1)
/* Properties of EXTCON_TYPE_CHG. */