mirror of
https://github.com/hardkernel/linux.git
synced 2026-03-26 04:20:23 +09:00
ANDROID: GKI: usb: phy: use ANDROID_KABI_USE for api notify_port_status
In struct usb_phy, the reserved slot 0 is reserved for a notify_port_status callback addition for ABI freeze. Now this api is accepted on upstream. Therefore, use ANDROID_KABI_USE to apply this api. Bug: 286930662 Change-Id: Iae894f9dfff77fd1f23bb48fefdb9b682c54de57 Signed-off-by: Stanley Chang <stanley_chang@realtek.com>
This commit is contained in:
committed by
Matthias Männich
parent
7aa67c1a12
commit
a9bc04930f
@@ -16146,6 +16146,11 @@ pointer_reference {
|
||||
kind: POINTER
|
||||
pointee_type_id: 0x9d4915b9
|
||||
}
|
||||
pointer_reference {
|
||||
id: 0x2dc28e15
|
||||
kind: POINTER
|
||||
pointee_type_id: 0x9d4adec8
|
||||
}
|
||||
pointer_reference {
|
||||
id: 0x2dc2cfb0
|
||||
kind: POINTER
|
||||
@@ -33942,6 +33947,10 @@ member {
|
||||
id: 0x2b0900e1
|
||||
type_id: 0x230a7397
|
||||
}
|
||||
member {
|
||||
id: 0x2b0c17ae
|
||||
type_id: 0x231e2eaa
|
||||
}
|
||||
member {
|
||||
id: 0x2b33b39f
|
||||
type_id: 0x23e0a7c8
|
||||
@@ -34612,6 +34621,10 @@ member {
|
||||
type_id: 0x56faddc1
|
||||
offset: 840
|
||||
}
|
||||
member {
|
||||
id: 0x36752b74
|
||||
type_id: 0x56faddc1
|
||||
}
|
||||
member {
|
||||
id: 0x36888cc2
|
||||
type_id: 0x550c431b
|
||||
@@ -34712,6 +34725,11 @@ member {
|
||||
type_id: 0x6f2909ad
|
||||
offset: 832
|
||||
}
|
||||
member {
|
||||
id: 0x38249613
|
||||
type_id: 0x6fbc1272
|
||||
offset: 2880
|
||||
}
|
||||
member {
|
||||
id: 0x386200a0
|
||||
type_id: 0x6ea6707c
|
||||
@@ -40074,10 +40092,9 @@ member {
|
||||
offset: 320
|
||||
}
|
||||
member {
|
||||
id: 0xedc9a74d
|
||||
id: 0xedc9a9c6
|
||||
name: "android_kabi_reserved0"
|
||||
type_id: 0x92233392
|
||||
offset: 2880
|
||||
}
|
||||
member {
|
||||
id: 0x2d08103a
|
||||
@@ -119222,6 +119239,11 @@ member {
|
||||
type_id: 0x2c538ce7
|
||||
offset: 1408
|
||||
}
|
||||
member {
|
||||
id: 0xe53004af
|
||||
name: "notify_port_status"
|
||||
type_id: 0x2dc28e15
|
||||
}
|
||||
member {
|
||||
id: 0xe90f3a32
|
||||
name: "notify_priv"
|
||||
@@ -184995,6 +185017,14 @@ struct_union {
|
||||
member_id: 0x566e6aad
|
||||
}
|
||||
}
|
||||
struct_union {
|
||||
id: 0x231e2eaa
|
||||
kind: STRUCT
|
||||
definition {
|
||||
bytesize: 8
|
||||
member_id: 0xedc9a9c6
|
||||
}
|
||||
}
|
||||
struct_union {
|
||||
id: 0x235335cf
|
||||
kind: STRUCT
|
||||
@@ -188438,6 +188468,16 @@ struct_union {
|
||||
member_id: 0x7cb52b3e
|
||||
}
|
||||
}
|
||||
struct_union {
|
||||
id: 0x6fbc1272
|
||||
kind: UNION
|
||||
definition {
|
||||
bytesize: 8
|
||||
member_id: 0xe53004af
|
||||
member_id: 0x2b0c17ae
|
||||
member_id: 0x36752b74
|
||||
}
|
||||
}
|
||||
struct_union {
|
||||
id: 0x701090f6
|
||||
kind: UNION
|
||||
@@ -232142,7 +232182,7 @@ struct_union {
|
||||
member_id: 0x975fa344
|
||||
member_id: 0x04f8f40a
|
||||
member_id: 0xed700ac6
|
||||
member_id: 0xedc9a74d
|
||||
member_id: 0x38249613
|
||||
member_id: 0x2d081c69
|
||||
member_id: 0x63760faa
|
||||
member_id: 0xac8946c7
|
||||
@@ -281192,6 +281232,14 @@ function {
|
||||
parameter_id: 0x01c5a749
|
||||
parameter_id: 0x2e27d122
|
||||
}
|
||||
function {
|
||||
id: 0x9d4adec8
|
||||
return_type_id: 0x6720d32f
|
||||
parameter_id: 0x05c2a3ca
|
||||
parameter_id: 0x6720d32f
|
||||
parameter_id: 0x914dbfdc
|
||||
parameter_id: 0x914dbfdc
|
||||
}
|
||||
function {
|
||||
id: 0x9d4b1066
|
||||
return_type_id: 0x6720d32f
|
||||
|
||||
@@ -146,10 +146,6 @@ struct usb_phy {
|
||||
*/
|
||||
int (*set_wakeup)(struct usb_phy *x, bool enabled);
|
||||
|
||||
/* notify phy port status change */
|
||||
int (*notify_port_status)(struct usb_phy *x, int port,
|
||||
u16 portstatus, u16 portchange);
|
||||
|
||||
/* notify phy connect status change */
|
||||
int (*notify_connect)(struct usb_phy *x,
|
||||
enum usb_device_speed speed);
|
||||
@@ -164,13 +160,9 @@ struct usb_phy {
|
||||
|
||||
ANDROID_VENDOR_DATA(1);
|
||||
|
||||
/*
|
||||
* Reserved slot 0 here is seserved for a notify_port_status callback addition that narrowly
|
||||
* missed the ABI freeze deadline due to upstream review disussions. See
|
||||
* https://lore.kernel.org/linux-usb/20230607062500.24669-1-stanley_chang@realtek.com/
|
||||
* for details. All other slots are for "normal" future ABI breaks in LTS updates
|
||||
*/
|
||||
ANDROID_KABI_RESERVE(0);
|
||||
/* notify phy port status change */
|
||||
ANDROID_KABI_USE(0, int (*notify_port_status)(struct usb_phy *x, int port,
|
||||
u16 portstatus, u16 portchange));
|
||||
ANDROID_KABI_RESERVE(1);
|
||||
ANDROID_KABI_RESERVE(2);
|
||||
ANDROID_KABI_RESERVE(3);
|
||||
|
||||
Reference in New Issue
Block a user