]> err.no Git - linux-2.6/commitdiff
[PATCH] aoa fabric layout: clean up messages
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 10 Jul 2006 11:44:37 +0000 (04:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 10 Jul 2006 20:24:19 +0000 (13:24 -0700)
This patch cleans up the printk's in the layout fabric and also makes it
display which type of GPIO access it is going to use.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
sound/aoa/fabrics/snd-aoa-fabric-layout.c

index cbc8a3b5cea4e3d638d936ad72782dba552e0121..94cac71ff281d3c49bb7ef582e913f345e1fd8e2 100644 (file)
@@ -950,11 +950,12 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
        layout_id = (unsigned int *) get_property(sound, "layout-id", NULL);
        if (!layout_id)
                goto outnodev;
-       printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d ", *layout_id);
+       printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n",
+              *layout_id);
 
        layout = find_layout_by_id(*layout_id);
        if (!layout) {
-               printk("(no idea how to handle)\n");
+               printk(KERN_ERR "snd-aoa-fabric-layout: unknown layout\n");
                goto outnodev;
        }
 
@@ -972,15 +973,17 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
        case 51: /* PowerBook5,4 */
        case 58: /* Mac Mini */
                ldev->gpio.methods = ftr_gpio_methods;
+               printk(KERN_DEBUG
+                      "snd-aoa-fabric-layout: Using direct GPIOs\n");
                break;
        default:
                ldev->gpio.methods = pmf_gpio_methods;
+               printk(KERN_DEBUG
+                      "snd-aoa-fabric-layout: Using PMF GPIOs\n");
        }
        ldev->selfptr_headphone.ptr = ldev;
        ldev->selfptr_lineout.ptr = ldev;
        sdev->ofdev.dev.driver_data = ldev;
-
-       printk("(using)\n");
        list_add(&ldev->list, &layouts_list);
        layouts_list_items++;