github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 11:37:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "Revert "ucsi: ucsi_glink: notify partner information""

Browse Source
This commit is contained in:
qctecmdr 2022-06-27 18:39:52 -07:00 committed by Gerrit - the friendly Code Review server
commit 8bea40e956
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/typec/ucsi/ucsi_glink.c
View File

@ -405,7 +405,7 @@ static void ucsi_qti_notify_work(struct work_struct *work)
static void ucsi_qti_notify(struct ucsi_dev *udev, unsigned int offset,
struct ucsi_connector_status *status, size_t len)
{
u8 conn_partner_type, conn_partner_flag;
u8 conn_partner_type;
bool cmd_requested;
struct constat_info_entry *entry;
@ -422,15 +422,6 @@ static void ucsi_qti_notify(struct ucsi_dev *udev, unsigned int offset,
return;
INIT_LIST_HEAD(&entry->node);
entry->constat_info.partner_usb = false;
entry->constat_info.partner_alternate_mode = false;
entry->constat_info.partner_change =
status->change & UCSI_CONSTAT_PARTNER_CHANGE;
entry->constat_info.connect =
status->flags & UCSI_CONSTAT_CONNECTED;
conn_partner_type = UCSI_CONSTAT_PARTNER_TYPE(status->flags);
switch (conn_partner_type) {
@ -440,24 +431,11 @@ static void ucsi_qti_notify(struct ucsi_dev *udev, unsigned int offset,
case UCSI_CONSTAT_PARTNER_TYPE_DEBUG:
entry->constat_info.acc = TYPEC_ACCESSORY_DEBUG;
break;
case UCSI_CONSTAT_PARTNER_TYPE_UFP:
case UCSI_CONSTAT_PARTNER_TYPE_CABLE:
case UCSI_CONSTAT_PARTNER_TYPE_CABLE_AND_UFP:
case UCSI_CONSTAT_PARTNER_TYPE_DFP:
entry->constat_info.partner_usb = true;
fallthrough;
default:
entry->constat_info.acc = TYPEC_ACCESSORY_NONE;
break;
}
conn_partner_flag = UCSI_CONSTAT_PARTNER_FLAGS(status->flags);
if (conn_partner_flag & UCSI_CONSTAT_PARTNER_FLAG_USB)
entry->constat_info.partner_usb = true;
if (conn_partner_flag & UCSI_CONSTAT_PARTNER_FLAG_ALT_MODE)
entry->constat_info.partner_alternate_mode = true;
mutex_lock(&udev->notify_lock);
list_add_tail(&entry->node, &udev->constat_info_list);
clear_bit(CONN_STAT_REQD, &udev->cmd_requested_flags);

4
include/linux/usb/ucsi_glink.h
View File

@ -11,10 +11,6 @@
struct ucsi_glink_constat_info {
enum typec_accessory acc;
bool partner_usb;
bool partner_alternate_mode;
bool partner_change;
bool connect;
};
struct notifier_block;