[gnome-settings-daemon] power: Remove spammy composite device output with one battery

[Bastien Nocera <hadess src gnome org>]

commit 51927edbfaa25c357d3dfedfdc18401d0852164a
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jan 17 13:30:25 2013 +0100

    power: Remove spammy composite device output with one battery

 plugins/power/gsd-power-manager.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 54a2eb3..35fdf6e 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -790,15 +790,12 @@ engine_get_composite_device (GsdPowerManager *manager,
         }
 
         /* just use the original device if only one primary battery */
-        if (battery_devices <= 1) {
-                g_debug ("using original device as only one primary battery");
-                device = original_device;
-                goto out;
-        }
+        if (battery_devices <= 1)
+                return original_device;
 
         /* use the composite device */
         device = manager->priv->device_composite;
-out:
+
         /* return composite device or original device */
         return device;
 }