mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-07 16:17:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

usb: typec: tcpm/tcpci_maxim: use device managed TCPCI port deregistration

Browse Source 
Instead of open-coding the call to tcpci_unregister_port() in various
places, let's just register a hook using devm_add_action_or_reset() so
that it gets called automatically as and when necessary by the device
management APIs.

Signed-off-by: André Draszik <andre.draszik@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240710-tcpc-cleanup-v1-15-0ec1f41f4263@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
André Draszik
2024-07-10 11:36:22 +01:00
committed by Greg Kroah-Hartman
parent 6ba97b42a5
commit e50f088780
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/usb/typec/tcpm/tcpci_maxim_core.c
View File

@@ -472,6 +472,11 @@ static bool max_tcpci_attempt_vconn_swap_discovery(struct tcpci *tcpci, struct t
return true;
}
static void max_tcpci_unregister_tcpci_port(void *tcpci)
{
tcpci_unregister_port(tcpci);
}
static int max_tcpci_probe(struct i2c_client *client)
{
int ret;
@@ -515,27 +520,21 @@ static int max_tcpci_probe(struct i2c_client *client)
return dev_err_probe(&client->dev, PTR_ERR(chip->tcpci),
"TCPCI port registration failed\n");
ret = devm_add_action_or_reset(&client->dev,
max_tcpci_unregister_tcpci_port,
chip->tcpci);
if (ret)
return ret;
chip->port = tcpci_get_tcpm_port(chip->tcpci);
ret = max_tcpci_init_alert(chip, client);
if (ret < 0)
goto unreg_port;
return dev_err_probe(&client->dev, ret,
"IRQ initialization failed\n");
device_init_wakeup(chip->dev, true);
return 0;
unreg_port:
tcpci_unregister_port(chip->tcpci);
return dev_err_probe(&client->dev, ret,
"Maxim TCPCI driver initialization failed\n");
}
static void max_tcpci_remove(struct i2c_client *client)
{
struct max_tcpci_chip *chip = i2c_get_clientdata(client);
if (!IS_ERR_OR_NULL(chip->tcpci))
tcpci_unregister_port(chip->tcpci);
}
static const struct i2c_device_id max_tcpci_id[] = {
@@ -558,7 +557,6 @@ static struct i2c_driver max_tcpci_i2c_driver = {
.of_match_table = of_match_ptr(max_tcpci_of_match),
},
.probe = max_tcpci_probe,
.remove = max_tcpci_remove,
.id_table = max_tcpci_id,
};
module_i2c_driver(max_tcpci_i2c_driver);