|
@@ -1077,24 +1077,24 @@ static DEVICE_ATTR(prop, 0644, prop##_show, prop##_store);
|
|
|
THRESHOLD_PROP_BUILDER(max_tx_thres);
|
|
|
THRESHOLD_PROP_BUILDER(max_rx_thres);
|
|
|
|
|
|
-static const struct attribute *threshold_attrs[] = {
|
|
|
+static const struct attribute *additional_attrs[] = {
|
|
|
&dev_attr_max_tx_thres.attr,
|
|
|
&dev_attr_max_rx_thres.attr,
|
|
|
NULL,
|
|
|
};
|
|
|
|
|
|
-static const struct attribute_group threshold_attr_group = {
|
|
|
- .attrs = (struct attribute **)threshold_attrs,
|
|
|
+static const struct attribute_group additional_attr_group = {
|
|
|
+ .attrs = (struct attribute **)additional_attrs,
|
|
|
};
|
|
|
|
|
|
-static inline int __devinit omap_thres_add(struct device *dev)
|
|
|
+static inline int __devinit omap_additional_add(struct device *dev)
|
|
|
{
|
|
|
- return sysfs_create_group(&dev->kobj, &threshold_attr_group);
|
|
|
+ return sysfs_create_group(&dev->kobj, &additional_attr_group);
|
|
|
}
|
|
|
|
|
|
-static inline void __devexit omap_thres_remove(struct device *dev)
|
|
|
+static inline void __devexit omap_additional_remove(struct device *dev)
|
|
|
{
|
|
|
- sysfs_remove_group(&dev->kobj, &threshold_attr_group);
|
|
|
+ sysfs_remove_group(&dev->kobj, &additional_attr_group);
|
|
|
}
|
|
|
|
|
|
static 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)
|
|
|
if (cpu_is_omap34xx()) {
|
|
|
mcbsp->max_tx_thres = max_thres(mcbsp);
|
|
|
mcbsp->max_rx_thres = max_thres(mcbsp);
|
|
|
- if (omap_thres_add(mcbsp->dev))
|
|
|
+ if (omap_additional_add(mcbsp->dev))
|
|
|
dev_warn(mcbsp->dev,
|
|
|
- "Unable to create threshold controls\n");
|
|
|
+ "Unable to create additional controls\n");
|
|
|
} else {
|
|
|
mcbsp->max_tx_thres = -EINVAL;
|
|
|
mcbsp->max_rx_thres = -EINVAL;
|
|
@@ -1114,7 +1114,7 @@ static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp)
|
|
|
static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp)
|
|
|
{
|
|
|
if (cpu_is_omap34xx())
|
|
|
- omap_thres_remove(mcbsp->dev);
|
|
|
+ omap_additional_remove(mcbsp->dev);
|
|
|
}
|
|
|
#else
|
|
|
static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) {}
|