提交 a677c8fb 编写于 作者: B Benjamin Herrenschmidt 提交者: Linus Torvalds

[PATCH] aoa fabric layout: clean up messages

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: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: NJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 e53fcabc
...@@ -950,11 +950,12 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) ...@@ -950,11 +950,12 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
layout_id = (unsigned int *) get_property(sound, "layout-id", NULL); layout_id = (unsigned int *) get_property(sound, "layout-id", NULL);
if (!layout_id) if (!layout_id)
goto outnodev; 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); layout = find_layout_by_id(*layout_id);
if (!layout) { if (!layout) {
printk("(no idea how to handle)\n"); printk(KERN_ERR "snd-aoa-fabric-layout: unknown layout\n");
goto outnodev; goto outnodev;
} }
...@@ -972,15 +973,17 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) ...@@ -972,15 +973,17 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
case 51: /* PowerBook5,4 */ case 51: /* PowerBook5,4 */
case 58: /* Mac Mini */ case 58: /* Mac Mini */
ldev->gpio.methods = ftr_gpio_methods; ldev->gpio.methods = ftr_gpio_methods;
printk(KERN_DEBUG
"snd-aoa-fabric-layout: Using direct GPIOs\n");
break; break;
default: default:
ldev->gpio.methods = pmf_gpio_methods; ldev->gpio.methods = pmf_gpio_methods;
printk(KERN_DEBUG
"snd-aoa-fabric-layout: Using PMF GPIOs\n");
} }
ldev->selfptr_headphone.ptr = ldev; ldev->selfptr_headphone.ptr = ldev;
ldev->selfptr_lineout.ptr = ldev; ldev->selfptr_lineout.ptr = ldev;
sdev->ofdev.dev.driver_data = ldev; sdev->ofdev.dev.driver_data = ldev;
printk("(using)\n");
list_add(&ldev->list, &layouts_list); list_add(&ldev->list, &layouts_list);
layouts_list_items++; layouts_list_items++;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册