greybus: core: return error code when creating host device

Return a pointer-coded error from greybus_create_hd() rather
than NULL in the event an error occurs.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 95d8c70cf20d958fa5b124ba556aff95a4dda681..7bfdbadb625052dff59dc2743b315c4ab2f484b4 100644 (file)
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -187,7 +187,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver
        if ((!driver->message_send) || (!driver->message_cancel) ||
            (!driver->submit_svc)) {
                pr_err("Must implement all greybus_host_driver callbacks!\n");
-               return NULL;
+               return ERR_PTR(-EINVAL);
        }
 
        /*
@@ -202,7 +202,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver
 
        hd = kzalloc(sizeof(*hd) + driver->hd_priv_size, GFP_KERNEL);
        if (!hd)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        kref_init(&hd->kref);
        hd->parent = parent;
@@ -215,7 +215,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver
        endo = gb_endo_create(hd, endo_id);
        if (IS_ERR(endo)) {
                greybus_remove_hd(hd);
-               return NULL;
+               return ERR_CAST(endo);
        }
        hd->endo = endo;
 

diff --git a/drivers/staging/greybus/es1.c b/drivers/staging/greybus/es1.c
index e0fae26d8ba3584558d47430b5d05013d063ddb1..1ed10f4b8e490234b3d5e4a09af5d0c4d0c7b2be 100644 (file)
--- a/drivers/staging/greybus/es1.c
+++ b/drivers/staging/greybus/es1.c
@@ -556,9 +556,9 @@ static int ap_probe(struct usb_interface *interface,
        udev = usb_get_dev(interface_to_usbdev(interface));
 
        hd = greybus_create_hd(&es1_driver, &udev->dev, ES1_GBUF_MSG_SIZE_MAX);
-       if (!hd) {
+       if (IS_ERR(hd)) {
                usb_put_dev(udev);
-               return -ENOMEM;
+               return PTR_ERR(hd);
        }
 
        es1 = hd_to_es1(hd);

diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 05aac3d7686ba169dcb37347738fa82381d1f842..4733adcb8a22512b3b61409ccb70626891bd34f0 100644 (file)
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -556,9 +556,9 @@ static int ap_probe(struct usb_interface *interface,
        udev = usb_get_dev(interface_to_usbdev(interface));
 
        hd = greybus_create_hd(&es1_driver, &udev->dev, ES1_GBUF_MSG_SIZE_MAX);
-       if (!hd) {
+       if (IS_ERR(hd)) {
                usb_put_dev(udev);
-               return -ENOMEM;
+               return PTR_ERR(hd);
        }
 
        es1 = hd_to_es1(hd);