diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2022-04-21 10:58:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-22 16:19:52 +0200 |
| commit | 2c334f12dc2523f28be5cda26d15b6fdeb70bddc (patch) | |
| tree | a4751de750b373dfb78618b07a10dd38f7d54c56 /drivers/tty/serial/icom.c | |
| parent | f73989f58d54b5b01363a2627dd9c99710770d62 (diff) | |
serial: icom: remove to_icom_adapter() and icom_kref_release()
Integrate both the to_icom_adapter() macro and icom_kref_release()
wrapper into icom_remove_adapter(). (And keep it icom_kref_release()
name.)
It makes the code easier to follow without complex indirections.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220421085808.24152-4-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/icom.c')
| -rw-r--r-- | drivers/tty/serial/icom.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index 42ba953c697e..fa284f9cbdb0 100644 --- a/drivers/tty/serial/icom.c +++ b/drivers/tty/serial/icom.c @@ -47,7 +47,6 @@ #define ICOM_DRIVER_NAME "icom" #define NR_PORTS 128 -#define to_icom_adapter(d) container_of(d, struct icom_adapter, kref) static inline struct icom_port *to_icom_port(struct uart_port *port) { @@ -1447,8 +1446,10 @@ static void icom_free_adapter(struct icom_adapter *icom_adapter) kfree(icom_adapter); } -static void icom_remove_adapter(struct icom_adapter *icom_adapter) +static void icom_kref_release(struct kref *kref) { + struct icom_adapter *icom_adapter = container_of(kref, + struct icom_adapter, kref); struct icom_port *icom_port; int index; @@ -1481,14 +1482,6 @@ static void icom_remove_adapter(struct icom_adapter *icom_adapter) icom_free_adapter(icom_adapter); } -static void icom_kref_release(struct kref *kref) -{ - struct icom_adapter *icom_adapter; - - icom_adapter = to_icom_adapter(kref); - icom_remove_adapter(icom_adapter); -} - static int icom_probe(struct pci_dev *dev, const struct pci_device_id *ent) { |