aboutsummaryrefslogtreecommitdiffstats
path: root/sound/ppc/pmac.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-05-03 03:26:52 -0400
committerPaul Mackerras <paulus@samba.org>2007-05-07 06:31:14 -0400
commit55b61fec22caa3e7872caea6c4100fc75cb8f49b (patch)
tree995c2cf733bbd9ee1adc6e77773b0e31e9c21267 /sound/ppc/pmac.c
parentd9333afd6a714760c13f76ba275a32ec7bd979c1 (diff)
[POWERPC] Rename device_is_compatible to of_device_is_compatible
for consistency with other Open Firmware interfaces (and Sparc). This is just a straight replacement. This leaves the compatibility define in place. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'sound/ppc/pmac.c')
-rw-r--r--sound/ppc/pmac.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 2bae9c1a2b54..5a2bef44a2f5 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -843,7 +843,7 @@ static void __init detect_byte_swap(struct snd_pmac *chip)
843 /* if seems that Keylargo can't byte-swap */ 843 /* if seems that Keylargo can't byte-swap */
844 for (mio = chip->node->parent; mio; mio = mio->parent) { 844 for (mio = chip->node->parent; mio; mio = mio->parent) {
845 if (strcmp(mio->name, "mac-io") == 0) { 845 if (strcmp(mio->name, "mac-io") == 0) {
846 if (device_is_compatible(mio, "Keylargo")) 846 if (of_device_is_compatible(mio, "Keylargo"))
847 chip->can_byte_swap = 0; 847 chip->can_byte_swap = 0;
848 break; 848 break;
849 } 849 }
@@ -910,7 +910,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
910 chip->node = of_find_node_by_name(NULL, "i2s-a"); 910 chip->node = of_find_node_by_name(NULL, "i2s-a");
911 if (chip->node && chip->node->parent && 911 if (chip->node && chip->node->parent &&
912 chip->node->parent->parent) { 912 chip->node->parent->parent) {
913 if (device_is_compatible(chip->node->parent->parent, 913 if (of_device_is_compatible(chip->node->parent->parent,
914 "K2-Keylargo")) 914 "K2-Keylargo"))
915 chip->is_k2 = 1; 915 chip->is_k2 = 1;
916 } 916 }
@@ -941,22 +941,22 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
941 return -ENODEV; 941 return -ENODEV;
942 } 942 }
943 /* This should be verified on older screamers */ 943 /* This should be verified on older screamers */
944 if (device_is_compatible(sound, "screamer")) { 944 if (of_device_is_compatible(sound, "screamer")) {
945 chip->model = PMAC_SCREAMER; 945 chip->model = PMAC_SCREAMER;
946 // chip->can_byte_swap = 0; /* FIXME: check this */ 946 // chip->can_byte_swap = 0; /* FIXME: check this */
947 } 947 }
948 if (device_is_compatible(sound, "burgundy")) { 948 if (of_device_is_compatible(sound, "burgundy")) {
949 chip->model = PMAC_BURGUNDY; 949 chip->model = PMAC_BURGUNDY;
950 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */ 950 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
951 } 951 }
952 if (device_is_compatible(sound, "daca")) { 952 if (of_device_is_compatible(sound, "daca")) {
953 chip->model = PMAC_DACA; 953 chip->model = PMAC_DACA;
954 chip->can_capture = 0; /* no capture */ 954 chip->can_capture = 0; /* no capture */
955 chip->can_duplex = 0; 955 chip->can_duplex = 0;
956 // chip->can_byte_swap = 0; /* FIXME: check this */ 956 // chip->can_byte_swap = 0; /* FIXME: check this */
957 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */ 957 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
958 } 958 }
959 if (device_is_compatible(sound, "tumbler")) { 959 if (of_device_is_compatible(sound, "tumbler")) {
960 chip->model = PMAC_TUMBLER; 960 chip->model = PMAC_TUMBLER;
961 chip->can_capture = 0; /* no capture */ 961 chip->can_capture = 0; /* no capture */
962 chip->can_duplex = 0; 962 chip->can_duplex = 0;
@@ -965,7 +965,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
965 chip->freq_table = tumbler_freqs; 965 chip->freq_table = tumbler_freqs;
966 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */ 966 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
967 } 967 }
968 if (device_is_compatible(sound, "snapper")) { 968 if (of_device_is_compatible(sound, "snapper")) {
969 chip->model = PMAC_SNAPPER; 969 chip->model = PMAC_SNAPPER;
970 // chip->can_byte_swap = 0; /* FIXME: check this */ 970 // chip->can_byte_swap = 0; /* FIXME: check this */
971 chip->num_freqs = ARRAY_SIZE(tumbler_freqs); 971 chip->num_freqs = ARRAY_SIZE(tumbler_freqs);