Commit f3031f9b authored by Christian A. Ehrhardt's avatar Christian A. Ehrhardt Committed by Greg Kroah-Hartman
Browse files

usb: typec: ucsi: Stop abuse of bit definitions from ucsi.h 



In ucsi.h there are flag definitions for the ->flags field
in struct ucsi. Some implementations abuse these bits for
their private ->flags fields e.g. in struct ucsi_acpi.

Move the definitions into the backend implementations that
still need them. While there fix one instance where the flag
name was not converted in a previous change.

No semantic change intended.

Signed-off-by: default avatarChristian A. Ehrhardt <lk@c--e.de>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240327224554.1772525-2-lk@c--e.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6151c021

drivers/usb/typec/ucsi/ucsi.h

+0 −2
Original line number Diff line number Diff line
@@ -403,8 +403,6 @@ struct ucsi { 
	/* PPM communication flags */

	unsigned long flags;

#define EVENT_PENDING	0

#define COMMAND_PENDING	1

#define ACK_PENDING	2



	unsigned long quirks;

#define UCSI_NO_PARTNER_PDOS	BIT(0)	/* Don't read partner's PDOs */

drivers/usb/typec/ucsi/ucsi_acpi.c

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ static void ucsi_acpi_notify(acpi_handle handle, u32 event, void *data) 
	    !test_bit(UCSI_ACPI_SUPPRESS_EVENT, &ua->flags))

		ucsi_connector_change(ua->ucsi, UCSI_CCI_CONNECTOR(cci));



	if (cci & UCSI_CCI_ACK_COMPLETE && test_bit(ACK_PENDING, &ua->flags))

	if (cci & UCSI_CCI_ACK_COMPLETE &&

	    test_bit(UCSI_ACPI_ACK_PENDING, &ua->flags))

		complete(&ua->complete);

	if (cci & UCSI_CCI_COMMAND_COMPLETE &&

	    test_bit(UCSI_ACPI_COMMAND_PENDING, &ua->flags))

drivers/usb/typec/ucsi/ucsi_stm32g0.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct ucsi_stm32g0 { 
	struct completion complete;

	struct device *dev;

	unsigned long flags;

#define COMMAND_PENDING	1

	const char *fw_name;

	struct ucsi *ucsi;

	bool suspended;