Commit 2c334f12 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

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: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220421085808.24152-4-jslaby@suse.czSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f73989f5
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#define ICOM_DRIVER_NAME "icom" #define ICOM_DRIVER_NAME "icom"
#define NR_PORTS 128 #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) 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) ...@@ -1447,8 +1446,10 @@ static void icom_free_adapter(struct icom_adapter *icom_adapter)
kfree(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; struct icom_port *icom_port;
int index; int index;
...@@ -1481,14 +1482,6 @@ static void icom_remove_adapter(struct icom_adapter *icom_adapter) ...@@ -1481,14 +1482,6 @@ static void icom_remove_adapter(struct icom_adapter *icom_adapter)
icom_free_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, static int icom_probe(struct pci_dev *dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment