Diff
Modified: trunk/drivers/staging/iio/adc/ad7150.c (8828 => 8829)
--- trunk/drivers/staging/iio/adc/ad7150.c 2010-05-23 06:34:32 UTC (rev 8828)
+++ trunk/drivers/staging/iio/adc/ad7150.c 2010-05-23 06:42:28 UTC (rev 8829)
@@ -184,7 +184,7 @@
return len;
}
-IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad7150_show_conversion_modes);
+static IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad7150_show_conversion_modes);
static ssize_t ad7150_show_conversion_mode(struct device *dev,
struct device_attribute *attr,
@@ -223,7 +223,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
ad7150_show_conversion_mode,
ad7150_store_conversion_mode);
@@ -234,7 +234,7 @@
return sprintf(buf, "adaptive\nfixed\n");
}
-IIO_DEV_ATTR_AVAIL_THRESHOLD_MODES(ad7150_show_threshold_modes);
+static IIO_DEV_ATTR_AVAIL_THRESHOLD_MODES(ad7150_show_threshold_modes);
static ssize_t ad7150_show_ch1_value(struct device *dev,
struct device_attribute *attr,
@@ -248,7 +248,7 @@
return sprintf(buf, "%d\n", ((int) data[0] << 8) | data[1]);
}
-IIO_DEV_ATTR_CH1_VALUE(ad7150_show_ch1_value);
+static IIO_DEV_ATTR_CH1_VALUE(ad7150_show_ch1_value);
static ssize_t ad7150_show_ch2_value(struct device *dev,
struct device_attribute *attr,
@@ -262,7 +262,7 @@
return sprintf(buf, "%d\n", ((int) data[0] << 8) | data[1]);
}
-IIO_DEV_ATTR_CH2_VALUE(ad7150_show_ch2_value);
+static IIO_DEV_ATTR_CH2_VALUE(ad7150_show_ch2_value);
static ssize_t ad7150_show_threshold_mode(struct device *dev,
struct device_attribute *attr,
@@ -303,7 +303,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_THRESHOLD_MODE(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_THRESHOLD_MODE(S_IRUGO | S_IWUSR,
ad7150_show_threshold_mode,
ad7150_store_threshold_mode);
@@ -339,7 +339,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH1_THRESHOLD(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH1_THRESHOLD(S_IRUGO | S_IWUSR,
ad7150_show_ch1_threshold,
ad7150_store_ch1_threshold);
@@ -375,7 +375,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH2_THRESHOLD(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH2_THRESHOLD(S_IRUGO | S_IWUSR,
ad7150_show_ch2_threshold,
ad7150_store_ch2_threshold);
@@ -410,7 +410,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH1_SENSITIVITY(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH1_SENSITIVITY(S_IRUGO | S_IWUSR,
ad7150_show_ch1_sensitivity,
ad7150_store_ch1_sensitivity);
@@ -445,7 +445,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH2_SENSITIVITY(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH2_SENSITIVITY(S_IRUGO | S_IWUSR,
ad7150_show_ch2_sensitivity,
ad7150_store_ch2_sensitivity);
@@ -480,7 +480,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH1_TIMEOUT(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH1_TIMEOUT(S_IRUGO | S_IWUSR,
ad7150_show_ch1_timeout,
ad7150_store_ch1_timeout);
@@ -515,7 +515,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH2_TIMEOUT(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH2_TIMEOUT(S_IRUGO | S_IWUSR,
ad7150_show_ch2_timeout,
ad7150_store_ch2_timeout);
@@ -551,7 +551,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH1_SETUP(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH1_SETUP(S_IRUGO | S_IWUSR,
ad7150_show_ch1_setup,
ad7150_store_ch1_setup);
@@ -586,7 +586,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH2_SETUP(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH2_SETUP(S_IRUGO | S_IWUSR,
ad7150_show_ch2_setup,
ad7150_store_ch2_setup);
@@ -599,7 +599,7 @@
return sprintf(buf, "%s\n", chip->name);
}
-IIO_DEVICE_ATTR(name, S_IRUGO, ad7150_show_name, NULL, 0);
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad7150_show_name, NULL, 0);
static ssize_t ad7150_show_powerdown_timer(struct device *dev,
struct device_attribute *attr,
@@ -631,7 +631,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_POWERDOWN_TIMER(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_POWERDOWN_TIMER(S_IRUGO | S_IWUSR,
ad7150_show_powerdown_timer,
ad7150_store_powerdown_timer);
Modified: trunk/drivers/staging/iio/adc/ad7152.c (8828 => 8829)
--- trunk/drivers/staging/iio/adc/ad7152.c 2010-05-23 06:34:32 UTC (rev 8828)
+++ trunk/drivers/staging/iio/adc/ad7152.c 2010-05-23 06:42:28 UTC (rev 8829)
@@ -162,7 +162,7 @@
return len;
}
-IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad7152_show_conversion_modes);
+static IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad7152_show_conversion_modes);
static ssize_t ad7152_show_ch1_value(struct device *dev,
struct device_attribute *attr,
@@ -176,7 +176,7 @@
return sprintf(buf, "%d\n", ((int)data[0] << 8) | data[1]);
}
-IIO_DEV_ATTR_CH1_VALUE(ad7152_show_ch1_value);
+static IIO_DEV_ATTR_CH1_VALUE(ad7152_show_ch1_value);
static ssize_t ad7152_show_ch2_value(struct device *dev,
struct device_attribute *attr,
@@ -190,7 +190,7 @@
return sprintf(buf, "%d\n", ((int)data[0] << 8) | data[1]);
}
-IIO_DEV_ATTR_CH2_VALUE(ad7152_show_ch2_value);
+static IIO_DEV_ATTR_CH2_VALUE(ad7152_show_ch2_value);
static ssize_t ad7152_show_conversion_mode(struct device *dev,
struct device_attribute *attr,
@@ -229,7 +229,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
ad7152_show_conversion_mode,
ad7152_store_conversion_mode);
@@ -265,7 +265,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH1_OFFSET(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH1_OFFSET(S_IRUGO | S_IWUSR,
ad7152_show_ch1_offset,
ad7152_store_ch1_offset);
@@ -301,7 +301,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH2_OFFSET(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH2_OFFSET(S_IRUGO | S_IWUSR,
ad7152_show_ch2_offset,
ad7152_store_ch2_offset);
@@ -337,7 +337,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH1_GAIN(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH1_GAIN(S_IRUGO | S_IWUSR,
ad7152_show_ch1_gain,
ad7152_store_ch1_gain);
@@ -373,7 +373,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH2_GAIN(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH2_GAIN(S_IRUGO | S_IWUSR,
ad7152_show_ch2_gain,
ad7152_store_ch2_gain);
@@ -408,7 +408,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH1_SETUP(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH1_SETUP(S_IRUGO | S_IWUSR,
ad7152_show_ch1_setup,
ad7152_store_ch1_setup);
@@ -443,7 +443,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CH2_SETUP(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CH2_SETUP(S_IRUGO | S_IWUSR,
ad7152_show_ch2_setup,
ad7152_store_ch2_setup);
@@ -478,7 +478,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_FILTER_RATE_SETUP(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_FILTER_RATE_SETUP(S_IRUGO | S_IWUSR,
ad7152_show_filter_rate_setup,
ad7152_store_filter_rate_setup);
@@ -491,7 +491,7 @@
return sprintf(buf, "%s\n", chip->name);
}
-IIO_DEVICE_ATTR(name, S_IRUGO, ad7152_show_name, NULL, 0);
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad7152_show_name, NULL, 0);
static struct attribute *ad7152_attributes[] = {
&iio_dev_attr_available_conversion_modes.dev_attr.attr,
Modified: trunk/drivers/staging/iio/adc/ad774x.c (8828 => 8829)
--- trunk/drivers/staging/iio/adc/ad774x.c 2010-05-23 06:34:32 UTC (rev 8828)
+++ trunk/drivers/staging/iio/adc/ad774x.c 2010-05-23 06:42:28 UTC (rev 8829)
@@ -167,7 +167,7 @@
return len;
}
-IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad774x_show_conversion_modes);
+static IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad774x_show_conversion_modes);
static ssize_t ad774x_show_conversion_mode(struct device *dev,
struct device_attribute *attr,
@@ -206,7 +206,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
ad774x_show_conversion_mode,
ad774x_store_conversion_mode);
@@ -223,7 +223,7 @@
return sprintf(buf, "%02x\n", data);
}
-IIO_DEV_ATTR_DACA_VALUE(ad774x_show_daca_value);
+static IIO_DEV_ATTR_DACA_VALUE(ad774x_show_daca_value);
static ssize_t ad774x_show_dacb_value(struct device *dev,
struct device_attribute *attr,
@@ -238,7 +238,7 @@
return sprintf(buf, "%02x\n", data);
}
-IIO_DEV_ATTR_DACB_VALUE(ad774x_show_dacb_value);
+static IIO_DEV_ATTR_DACB_VALUE(ad774x_show_dacb_value);
static ssize_t ad774x_show_cap_setup(struct device *dev,
struct device_attribute *attr,
@@ -272,7 +272,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CAP_SETUP(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CAP_SETUP(S_IRUGO | S_IWUSR,
ad774x_show_cap_setup,
ad774x_store_cap_setup);
@@ -307,7 +307,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_VT_SETUP(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_VT_SETUP(S_IRUGO | S_IWUSR,
ad774x_show_vt_setup,
ad774x_store_vt_setup);
@@ -342,7 +342,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_EXEC_SETUP(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_EXEC_SETUP(S_IRUGO | S_IWUSR,
ad774x_show_exec_setup,
ad774x_store_exec_setup);
@@ -378,7 +378,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_VOLT_GAIN(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_VOLT_GAIN(S_IRUGO | S_IWUSR,
ad774x_show_volt_gain,
ad774x_store_volt_gain);
@@ -397,7 +397,7 @@
return sprintf(buf, "%ld\n", data);
}
-IIO_DEV_ATTR_CAP_DATA(ad774x_show_cap_data);
+static IIO_DEV_ATTR_CAP_DATA(ad774x_show_cap_data);
static ssize_t ad774x_show_vt_data(struct device *dev,
struct device_attribute *attr,
@@ -414,7 +414,7 @@
return sprintf(buf, "%ld\n", data);
}
-IIO_DEV_ATTR_VT_DATA(ad774x_show_vt_data);
+static IIO_DEV_ATTR_VT_DATA(ad774x_show_vt_data);
static ssize_t ad774x_show_cap_offs(struct device *dev,
struct device_attribute *attr,
@@ -448,7 +448,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CAP_OFFS(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CAP_OFFS(S_IRUGO | S_IWUSR,
ad774x_show_cap_offs,
ad774x_store_cap_offs);
@@ -484,7 +484,7 @@
return -EINVAL;
}
-IIO_DEV_ATTR_CAP_GAIN(S_IRUGO | S_IWUSR,
+static IIO_DEV_ATTR_CAP_GAIN(S_IRUGO | S_IWUSR,
ad774x_show_cap_gain,
ad774x_store_cap_gain);
@@ -497,7 +497,7 @@
return sprintf(buf, "%s\n", chip->name);
}
-IIO_DEVICE_ATTR(name, S_IRUGO, ad774x_show_name, NULL, 0);
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad774x_show_name, NULL, 0);
static struct attribute *ad774x_attributes[] = {
&iio_dev_attr_available_conversion_modes.dev_attr.attr,
