aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-07-10 07:44:37 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-10 16:24:19 -0400
commita677c8fb8aa03e6ad9c206cb7284d294761ced2c (patch)
treeb42b3be11de623314df203493bf945ae687cefea /sound
parente53fcabc6d923e9c1cdd073ea2e2212daf907622 (diff)
[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: 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>
Diffstat (limited to 'sound')
-rw-r--r--sound/aoa/fabrics/snd-aoa-fabric-layout.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
index cbc8a3b5cea4..94cac71ff281 100644
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
@@ -950,11 +950,12 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
950 layout_id = (unsigned int *) get_property(sound, "layout-id", NULL); 950 layout_id = (unsigned int *) get_property(sound, "layout-id", NULL);
951 if (!layout_id) 951 if (!layout_id)
952 goto outnodev; 952 goto outnodev;
953 printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d ", *layout_id); 953 printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n",
954 *layout_id);
954 955
955 layout = find_layout_by_id(*layout_id); 956 layout = find_layout_by_id(*layout_id);
956 if (!layout) { 957 if (!layout) {
957 printk("(no idea how to handle)\n"); 958 printk(KERN_ERR "snd-aoa-fabric-layout: unknown layout\n");
958 goto outnodev; 959 goto outnodev;
959 } 960 }
960 961
@@ -972,15 +973,17 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
972 case 51: /* PowerBook5,4 */ 973 case 51: /* PowerBook5,4 */
973 case 58: /* Mac Mini */ 974 case 58: /* Mac Mini */
974 ldev->gpio.methods = ftr_gpio_methods; 975 ldev->gpio.methods = ftr_gpio_methods;
976 printk(KERN_DEBUG
977 "snd-aoa-fabric-layout: Using direct GPIOs\n");
975 break; 978 break;
976 default: 979 default:
977 ldev->gpio.methods = pmf_gpio_methods; 980 ldev->gpio.methods = pmf_gpio_methods;
981 printk(KERN_DEBUG
982 "snd-aoa-fabric-layout: Using PMF GPIOs\n");
978 } 983 }
979 ldev->selfptr_headphone.ptr = ldev; 984 ldev->selfptr_headphone.ptr = ldev;
980 ldev->selfptr_lineout.ptr = ldev; 985 ldev->selfptr_lineout.ptr = ldev;
981 sdev->ofdev.dev.driver_data = ldev; 986 sdev->ofdev.dev.driver_data = ldev;
982
983 printk("(using)\n");
984 list_add(&ldev->list, &layouts_list); 987 list_add(&ldev->list, &layouts_list);
985 layouts_list_items++; 988 layouts_list_items++;
986 989