diff options
| -rw-r--r-- | drivers/staging/greybus/core.c | 10 | ||||
| -rw-r--r-- | drivers/staging/greybus/greybus.h | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c index bc9c1ebf7983..d4fffecb1abc 100644 --- a/drivers/staging/greybus/core.c +++ b/drivers/staging/greybus/core.c @@ -170,7 +170,6 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver size_t buffer_size_max) { struct greybus_host_device *hd; - int ret; /* * Validate that the driver implements all of the callbacks @@ -201,19 +200,12 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver if (!hd) return ERR_PTR(-ENOMEM); - ida_init(&hd->cport_id_map); - /* Reserve CPort id 0 */ - ret = ida_simple_get(&hd->cport_id_map, 0, 1, GFP_KERNEL); - if (ret < 0) { - kfree(hd); - return ERR_PTR(ret); - } - kref_init(&hd->kref); hd->parent = parent; hd->driver = driver; INIT_LIST_HEAD(&hd->interfaces); INIT_LIST_HEAD(&hd->connections); + ida_init(&hd->cport_id_map); hd->buffer_size_max = buffer_size_max; return hd; diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h index d727dea6847e..5c6f9607cf73 100644 --- a/drivers/staging/greybus/greybus.h +++ b/drivers/staging/greybus/greybus.h @@ -198,7 +198,7 @@ static inline int is_gb_connection(const struct device *dev) static inline bool cport_id_valid(u16 cport_id) { - return cport_id && cport_id != CPORT_ID_BAD && cport_id <= CPORT_ID_MAX; + return cport_id != CPORT_ID_BAD && cport_id <= CPORT_ID_MAX; } #endif /* __KERNEL__ */ |