The patch titled aoa fabric layout: clean up messages has been added to the -mm tree. Its filename is aoa-fabric-layout-clean-up-messages.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: aoa fabric layout: clean up messages From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- sound/aoa/fabrics/snd-aoa-fabric-layout.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff -puN sound/aoa/fabrics/snd-aoa-fabric-layout.c~aoa-fabric-layout-clean-up-messages sound/aoa/fabrics/snd-aoa-fabric-layout.c --- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c~aoa-fabric-layout-clean-up-messages +++ a/sound/aoa/fabrics/snd-aoa-fabric-layout.c @@ -950,11 +950,12 @@ static int aoa_fabric_layout_probe(struc 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(struc 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++; _ Patches currently in -mm which might be from benh@xxxxxxxxxxxxxxxxxxx are fix-snd-aoa-irq-conversion.patch aoa-i2sbus-move-module-parameter-declaration-up.patch aoa-i2sbus-fix-for-powermac72-and-73.patch aoa-fix-when-all-is-built-into-the-kernel.patch aoa-i2sbus-revamp-control-layer.patch aoa-pmf-gpio-report-if-function-calling-fails.patch aoa-fabric-layout-clean-up-messages.patch aoa-tas-fix-initialisation-reset.patch macintosh-mangle-caps-lock-events-on-adb-keyboards.patch git-powerpc.patch git-powerpc-briq_panel-Kconfig-fix.patch powermac-combined-fixes-for-backlight-code.patch fix-broken-dubious-driver-suspend-methods.patch apple-motion-sensor-driver.patch genirq-convert-the-x86_64-architecture-to-irq-chips.patch genirq-convert-the-i386-architecture-to-irq-chips.patch genirq-irq-convert-the-move_irq-flag-from-a-32bit-word-to-a-single-bit.patch genirq-irq-add-moved_masked_irq.patch genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch genirq-msi-simplify-msi-enable-and-disable.patch genirq-msi-make-the-msi-boolean-tests-return-either-0-or-1.patch genirq-msi-implement-helper-functions-read_msi_msg-and-write_msi_msg.patch genirq-msi-refactor-the-msi_ops.patch genirq-msi-simplify-the-msi-irq-limit-policy.patch genirq-irq-add-a-dynamic-irq-creation-api.patch genirq-ia64-irq-dynamic-irq-support.patch genirq-i386-irq-dynamic-irq-support.patch genirq-x86_64-irq-dynamic-irq-support.patch genirq-msi-make-the-msi-code-irq-based-and-not-vector-based.patch genirq-x86_64-irq-move-msi-message-composition-into-io_apicc.patch genirq-i386-irq-move-msi-message-composition-into-io_apicc.patch genirq-msi-only-build-msi-apicc-on-ia64.patch genirq-x86_64-irq-remove-the-msi-assumption-that-irq-==-vector.patch genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch genirq-irq-remove-msi-hacks.patch genirq-irq-generalize-the-check-for-hardirq_bits.patch genirq-x86_64-irq-make-the-external-irq-handlers-report-their-vector-not-the-irq-number.patch genirq-x86_64-irq-make-vector_irq-per-cpu.patch genirq-x86_64-irq-kill-gsi_irq_sharing.patch genirq-x86_64-irq-kill-irq-compression.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html