NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "usb: typec: bus: verify partner exists in typec_altmode_attention"

Browse source 
This reverts commit 0d3b5fe479 which is
commit f23643306430f86e2f413ee2b986e0773e79da31 upstream.

It breaks the Android ABI and is not needed for Android systems at this
point in time.  If needed in the future, it can come back in an abi-safe
way.

Bug: 161946584
Change-Id: Ib271c569a1f86228f86e4c9b164d96f1bf0f0019
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-10-12 14:11:06 +00:00
parent 1592fd4684
commit acef80535a
3 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/usb/typec/bus.c
View file

@ -154,20 +154,12 @@ EXPORT_SYMBOL_GPL(typec_altmode_exit);
*
* Notifies the partner of @adev about Attention command.
*/
int typec_altmode_attention(struct typec_altmode *adev, u32 vdo)
void typec_altmode_attention(struct typec_altmode *adev, u32 vdo)
{
struct altmode *partner = to_altmode(adev)->partner;
struct typec_altmode *pdev;
if (!partner)
return -ENODEV;
pdev = &partner->adev;
struct typec_altmode *pdev = &to_altmode(adev)->partner->adev;
if (pdev->ops && pdev->ops->attention)
pdev->ops->attention(pdev, vdo);
return 0;
}
EXPORT_SYMBOL_GPL(typec_altmode_attention);

3
drivers/usb/typec/tcpm/tcpm.c
View file

@ -1885,8 +1885,7 @@ static void tcpm_handle_vdm_request(struct tcpm_port *port,
}
break;
case ADEV_ATTENTION:
if (typec_altmode_attention(adev, p[1]))
tcpm_log(port, "typec_altmode_attention no port partner altmode");
typec_altmode_attention(adev, p[1]);
break;
}
}

2
include/linux/usb/typec_altmode.h
View file

@ -69,7 +69,7 @@ struct typec_altmode_ops {
int typec_altmode_enter(struct typec_altmode *altmode, u32 *vdo);
int typec_altmode_exit(struct typec_altmode *altmode);
int typec_altmode_attention(struct typec_altmode *altmode, u32 vdo);
void typec_altmode_attention(struct typec_altmode *altmode, u32 vdo);
int typec_altmode_vdm(struct typec_altmode *altmode,
const u32 header, const u32 *vdo, int count);
int typec_altmode_notify(struct typec_altmode *altmode, unsigned long conf,