aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Valentin <eduardo.valentin@nokia.com>2009-08-20 09:18:13 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-20 15:10:26 -0400
commit4c8200aeb04b8aeaf8c7425f49caf761e2cda95a (patch)
treeefaef848c390c4df72221fa1230d4c3ee5ce477e
parent7e4f943b725008272d5c50e676a89d642232a4e3 (diff)
OMAP: McBSP: Rename thres sysfs symbols
This patch renames the symbols that handles threshold sysfs properties. This way we can add more sysfs properties to them. Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--arch/arm/plat-omap/mcbsp.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index 0bbc912e548d..ccaa9aedb0a2 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -1077,24 +1077,24 @@ static DEVICE_ATTR(prop, 0644, prop##_show, prop##_store);
1077THRESHOLD_PROP_BUILDER(max_tx_thres); 1077THRESHOLD_PROP_BUILDER(max_tx_thres);
1078THRESHOLD_PROP_BUILDER(max_rx_thres); 1078THRESHOLD_PROP_BUILDER(max_rx_thres);
1079 1079
1080static const struct attribute *threshold_attrs[] = { 1080static const struct attribute *additional_attrs[] = {
1081 &dev_attr_max_tx_thres.attr, 1081 &dev_attr_max_tx_thres.attr,
1082 &dev_attr_max_rx_thres.attr, 1082 &dev_attr_max_rx_thres.attr,
1083 NULL, 1083 NULL,
1084}; 1084};
1085 1085
1086static const struct attribute_group threshold_attr_group = { 1086static const struct attribute_group additional_attr_group = {
1087 .attrs = (struct attribute **)threshold_attrs, 1087 .attrs = (struct attribute **)additional_attrs,
1088}; 1088};
1089 1089
1090static inline int __devinit omap_thres_add(struct device *dev) 1090static inline int __devinit omap_additional_add(struct device *dev)
1091{ 1091{
1092 return sysfs_create_group(&dev->kobj, &threshold_attr_group); 1092 return sysfs_create_group(&dev->kobj, &additional_attr_group);
1093} 1093}
1094 1094
1095static inline void __devexit omap_thres_remove(struct device *dev) 1095static inline void __devexit omap_additional_remove(struct device *dev)
1096{ 1096{
1097 sysfs_remove_group(&dev->kobj, &threshold_attr_group); 1097 sysfs_remove_group(&dev->kobj, &additional_attr_group);
1098} 1098}
1099 1099
1100static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) 1100static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp)
@@ -1102,9 +1102,9 @@ static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp)
1102 if (cpu_is_omap34xx()) { 1102 if (cpu_is_omap34xx()) {
1103 mcbsp->max_tx_thres = max_thres(mcbsp); 1103 mcbsp->max_tx_thres = max_thres(mcbsp);
1104 mcbsp->max_rx_thres = max_thres(mcbsp); 1104 mcbsp->max_rx_thres = max_thres(mcbsp);
1105 if (omap_thres_add(mcbsp->dev)) 1105 if (omap_additional_add(mcbsp->dev))
1106 dev_warn(mcbsp->dev, 1106 dev_warn(mcbsp->dev,
1107 "Unable to create threshold controls\n"); 1107 "Unable to create additional controls\n");
1108 } else { 1108 } else {
1109 mcbsp->max_tx_thres = -EINVAL; 1109 mcbsp->max_tx_thres = -EINVAL;
1110 mcbsp->max_rx_thres = -EINVAL; 1110 mcbsp->max_rx_thres = -EINVAL;
@@ -1114,7 +1114,7 @@ static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp)
1114static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp) 1114static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp)
1115{ 1115{
1116 if (cpu_is_omap34xx()) 1116 if (cpu_is_omap34xx())
1117 omap_thres_remove(mcbsp->dev); 1117 omap_additional_remove(mcbsp->dev);
1118} 1118}
1119#else 1119#else
1120static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) {} 1120static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) {}