Skip to contentSkip to conversation

drivers/rpmsg/virtio_rpmsg_bus.c: fix the return value of rpmsg_init

PATCH In review Barry Song 2 participants 3 messages Feb 17, 2014 – Feb 19, 2014 Remote processor messaging (rpmsg)

lore
Share & tools
lore

Barry Song

author
#0 lore raw

PATCH 1/1 drivers/rpmsg/virtio_rpmsg_bus.c: fix the return value of rpmsg_init

From: Wei Chen <[email protected]>

rpmsg_init() always return ERROR code or random integer now, this patch fixes it.

---
 drivers/rpmsg/virtio_rpmsg_bus.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +2 -1
index b6135d4..7812585 100644
@@ -1096,9 +1096,10 @@ static int __init rpmsg_init(void)
 	if (ret) {
 		pr_err("failed to register virtio driver: %d\n", ret);
 		bus_unregister(&rpmsg_bus);
+		return ret;
 	}
 
-	return ret;
+	return 0;
 }
 subsys_initcall(rpmsg_init);
 
Signature · 1 line
1.7.5.4
#1 lore raw
Quoted 10 lines · On Mon, 17 Feb 2014 16:13:34 +0800 Barry Song <[email protected]> wrote:

From: Wei Chen <[email protected]>

rpmsg_init() always return ERROR code or random integer now, this patch fixes it.

...

drivers/rpmsg/virtio_rpmsg_bus.c static int __init rpmsg_init(void) · line 1103

Quoted 9 lines
drivers/rpmsg/virtio_rpmsg_bus.c +2 -1
@@ -1096,9 +1096,10 @@ static int __init rpmsg_init(void)
 	if (ret) {
 		pr_err("failed to register virtio driver: %d\n", ret);
 		bus_unregister(&rpmsg_bus);
+		return ret;
 	}
 
-	return ret;
+	return 0;
 }

Look more closely. This patch has no effect...

author
#2 lore raw

2014-02-19 6:19 GMT+08:00 Andrew Morton <[email protected]>:

Quoted 18 lines · On Mon, 17 Feb 2014 16:13:34 +0800 Barry Song <[email protected]> wrote:
Quoted 17 lines

From: Wei Chen <[email protected]>

rpmsg_init() always return ERROR code or random integer now, this patch fixes it.

...

drivers/rpmsg/virtio_rpmsg_bus.c +1 -0
@@ -1096,9 +1096,10 @@ static int __init rpmsg_init(void)
      if (ret) {
              pr_err("failed to register virtio driver: %d\n", ret);
              bus_unregister(&rpmsg_bus);
+             return ret;
      }
 
Quoted 5 lines

drivers/rpmsg/virtio_rpmsg_bus.c static int __init rpmsg_init(void) · line 1103

Quoted 3 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1 -1
-     return ret;
+     return 0;
 }

Look more closely. This patch has no effect...

yes, when i look again i find it does have no effect as successful bus_register() has made ret 0. but the codes are much unreadable then....

static int __init rpmsg_init(void)

{
        int ret;

        ret = bus_register(&rpmsg_bus);
        if (ret) {
                pr_err("failed to register rpmsg bus: %d\n", ret);
                return ret;
        }

        ret = register_virtio_driver(&virtio_ipc_driver);
        if (ret) {
                pr_err("failed to register virtio driver: %d\n", ret);
                bus_unregister(&rpmsg_bus);
        }

        return ret;
}

subsys_initcall(rpmsg_init);

-barry