usb: typec: Start using ERR_PTR

[linux.git] / drivers / usb / typec / typec.c

diff --git a/drivers/usb/typec/typec.c b/drivers/usb/typec/typec.c
index 735726ced6024dcd1253b8a987ae0e945145d135..dc28ad868d931c02f92c636c314ecf028f078f3f 100644 (file)
--- a/drivers/usb/typec/typec.c
+++ b/drivers/usb/typec/typec.c
@@ -386,7 +386,7 @@ typec_register_altmode(struct device *parent,
 
        alt = kzalloc(sizeof(*alt), GFP_KERNEL);
        if (!alt)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        alt->svid = desc->svid;
        alt->n_modes = desc->n_modes;
@@ -402,7 +402,7 @@ typec_register_altmode(struct device *parent,
                dev_err(parent, "failed to register alternate mode (%d)\n",
                        ret);
                put_device(&alt->dev);
-               return NULL;
+               return ERR_PTR(ret);
        }
 
        return alt;
@@ -417,7 +417,7 @@ typec_register_altmode(struct device *parent,
  */
 void typec_unregister_altmode(struct typec_altmode *alt)
 {
-       if (alt)
+       if (!IS_ERR_OR_NULL(alt))
                device_unregister(&alt->dev);
 }
 EXPORT_SYMBOL_GPL(typec_unregister_altmode);
@@ -509,7 +509,7 @@ EXPORT_SYMBOL_GPL(typec_partner_register_altmode);
  *
  * Registers a device for USB Type-C Partner described in @desc.
  *
- * Returns handle to the partner on success or NULL on failure.
+ * Returns handle to the partner on success or ERR_PTR on failure.
  */
 struct typec_partner *typec_register_partner(struct typec_port *port,
                                             struct typec_partner_desc *desc)
@@ -519,7 +519,7 @@ struct typec_partner *typec_register_partner(struct typec_port *port,
 
        partner = kzalloc(sizeof(*partner), GFP_KERNEL);
        if (!partner)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        partner->usb_pd = desc->usb_pd;
        partner->accessory = desc->accessory;
@@ -542,7 +542,7 @@ struct typec_partner *typec_register_partner(struct typec_port *port,
        if (ret) {
                dev_err(&port->dev, "failed to register partner (%d)\n", ret);
                put_device(&partner->dev);
-               return NULL;
+               return ERR_PTR(ret);
        }
 
        return partner;
@@ -557,7 +557,7 @@ EXPORT_SYMBOL_GPL(typec_register_partner);
  */
 void typec_unregister_partner(struct typec_partner *partner)
 {
-       if (partner)
+       if (!IS_ERR_OR_NULL(partner))
                device_unregister(&partner->dev);
 }
 EXPORT_SYMBOL_GPL(typec_unregister_partner);
@@ -587,7 +587,7 @@ static const struct device_type typec_plug_dev_type = {
  * the plug lists in response to Discover Modes command need to be listed in an
  * array in @desc.
  *
- * Returns handle to the alternate mode on success or NULL on failure.
+ * Returns handle to the alternate mode on success or ERR_PTR on failure.
  */
 struct typec_altmode *
 typec_plug_register_altmode(struct typec_plug *plug,
@@ -606,7 +606,7 @@ EXPORT_SYMBOL_GPL(typec_plug_register_altmode);
  * Cable Plug represents a plug with electronics in it that can response to USB
  * Power Delivery SOP Prime or SOP Double Prime packages.
  *
- * Returns handle to the cable plug on success or NULL on failure.
+ * Returns handle to the cable plug on success or ERR_PTR on failure.
  */
 struct typec_plug *typec_register_plug(struct typec_cable *cable,
                                       struct typec_plug_desc *desc)
@@ -617,7 +617,7 @@ struct typec_plug *typec_register_plug(struct typec_cable *cable,
 
        plug = kzalloc(sizeof(*plug), GFP_KERNEL);
        if (!plug)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        sprintf(name, "plug%d", desc->index);
 
@@ -631,7 +631,7 @@ struct typec_plug *typec_register_plug(struct typec_cable *cable,
        if (ret) {
                dev_err(&cable->dev, "failed to register plug (%d)\n", ret);
                put_device(&plug->dev);
-               return NULL;
+               return ERR_PTR(ret);
        }
 
        return plug;
@@ -646,7 +646,7 @@ EXPORT_SYMBOL_GPL(typec_register_plug);
  */
 void typec_unregister_plug(struct typec_plug *plug)
 {
-       if (plug)
+       if (!IS_ERR_OR_NULL(plug))
                device_unregister(&plug->dev);
 }
 EXPORT_SYMBOL_GPL(typec_unregister_plug);
@@ -724,7 +724,7 @@ EXPORT_SYMBOL_GPL(typec_cable_set_identity);
  * Registers a device for USB Type-C Cable described in @desc. The cable will be
  * parent for the optional cable plug devises.
  *
- * Returns handle to the cable on success or NULL on failure.
+ * Returns handle to the cable on success or ERR_PTR on failure.
  */
 struct typec_cable *typec_register_cable(struct typec_port *port,
                                         struct typec_cable_desc *desc)
@@ -734,7 +734,7 @@ struct typec_cable *typec_register_cable(struct typec_port *port,
 
        cable = kzalloc(sizeof(*cable), GFP_KERNEL);
        if (!cable)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        cable->type = desc->type;
        cable->active = desc->active;
@@ -757,7 +757,7 @@ struct typec_cable *typec_register_cable(struct typec_port *port,
        if (ret) {
                dev_err(&port->dev, "failed to register cable (%d)\n", ret);
                put_device(&cable->dev);
-               return NULL;
+               return ERR_PTR(ret);
        }
 
        return cable;
@@ -772,7 +772,7 @@ EXPORT_SYMBOL_GPL(typec_register_cable);
  */
 void typec_unregister_cable(struct typec_cable *cable)
 {
-       if (cable)
+       if (!IS_ERR_OR_NULL(cable))
                device_unregister(&cable->dev);
 }
 EXPORT_SYMBOL_GPL(typec_unregister_cable);
@@ -1256,7 +1256,7 @@ EXPORT_SYMBOL_GPL(typec_set_pwr_opmode);
  * This routine is used to register an alternate mode that @port is capable of
  * supporting.
  *
- * Returns handle to the alternate mode on success or NULL on failure.
+ * Returns handle to the alternate mode on success or ERR_PTR on failure.
  */
 struct typec_altmode *
 typec_port_register_altmode(struct typec_port *port,
@@ -1273,7 +1273,7 @@ EXPORT_SYMBOL_GPL(typec_port_register_altmode);
  *
  * Registers a device for USB Type-C Port described in @cap.
  *
- * Returns handle to the port on success or NULL on failure.
+ * Returns handle to the port on success or ERR_PTR on failure.
  */
 struct typec_port *typec_register_port(struct device *parent,
                                       const struct typec_capability *cap)
@@ -1285,12 +1285,12 @@ struct typec_port *typec_register_port(struct device *parent,
 
        port = kzalloc(sizeof(*port), GFP_KERNEL);
        if (!port)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        id = ida_simple_get(&typec_index_ida, 0, 0, GFP_KERNEL);
        if (id < 0) {
                kfree(port);
-               return NULL;
+               return ERR_PTR(id);
        }
 
        if (cap->type == TYPEC_PORT_DFP)
@@ -1326,7 +1326,7 @@ struct typec_port *typec_register_port(struct device *parent,
        if (ret) {
                dev_err(parent, "failed to register port (%d)\n", ret);
                put_device(&port->dev);
-               return NULL;
+               return ERR_PTR(ret);
        }
 
        return port;
@@ -1341,7 +1341,7 @@ EXPORT_SYMBOL_GPL(typec_register_port);
  */
 void typec_unregister_port(struct typec_port *port)
 {
-       if (port)
+       if (!IS_ERR_OR_NULL(port))
                device_unregister(&port->dev);
 }
 EXPORT_SYMBOL_GPL(typec_unregister_port);