Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux.git] / drivers / ptp / ptp_sysfs.c

diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
index 53d43954a9740a5520229a1e8798516805a73c19..48401dfcd999a7f9ff31f68c7846964f9bc42937 100644 (file)
--- a/drivers/ptp/ptp_sysfs.c
+++ b/drivers/ptp/ptp_sysfs.c
@@ -46,27 +46,6 @@ PTP_SHOW_INT(n_periodic_outputs, n_per_out);
 PTP_SHOW_INT(n_programmable_pins, n_pins);
 PTP_SHOW_INT(pps_available, pps);
 
-static struct attribute *ptp_attrs[] = {
-       &dev_attr_clock_name.attr,
-       &dev_attr_max_adjustment.attr,
-       &dev_attr_n_alarms.attr,
-       &dev_attr_n_external_timestamps.attr,
-       &dev_attr_n_periodic_outputs.attr,
-       &dev_attr_n_programmable_pins.attr,
-       &dev_attr_pps_available.attr,
-       NULL,
-};
-
-static const struct attribute_group ptp_group = {
-       .attrs = ptp_attrs,
-};
-
-const struct attribute_group *ptp_groups[] = {
-       &ptp_group,
-       NULL,
-};
-
-
 static ssize_t extts_enable_store(struct device *dev,
                                  struct device_attribute *attr,
                                  const char *buf, size_t count)
@@ -91,6 +70,7 @@ static ssize_t extts_enable_store(struct device *dev,
 out:
        return err;
 }
+static DEVICE_ATTR(extts_enable, 0220, NULL, extts_enable_store);
 
 static ssize_t extts_fifo_show(struct device *dev,
                               struct device_attribute *attr, char *page)
@@ -124,6 +104,7 @@ static ssize_t extts_fifo_show(struct device *dev,
        mutex_unlock(&ptp->tsevq_mux);
        return cnt;
 }
+static DEVICE_ATTR(fifo, 0444, extts_fifo_show, NULL);
 
 static ssize_t period_store(struct device *dev,
                            struct device_attribute *attr,
@@ -151,6 +132,7 @@ static ssize_t period_store(struct device *dev,
 out:
        return err;
 }
+static DEVICE_ATTR(period, 0220, NULL, period_store);
 
 static ssize_t pps_enable_store(struct device *dev,
                                struct device_attribute *attr,
@@ -177,6 +159,57 @@ static ssize_t pps_enable_store(struct device *dev,
 out:
        return err;
 }
+static DEVICE_ATTR(pps_enable, 0220, NULL, pps_enable_store);
+
+static struct attribute *ptp_attrs[] = {
+       &dev_attr_clock_name.attr,
+
+       &dev_attr_max_adjustment.attr,
+       &dev_attr_n_alarms.attr,
+       &dev_attr_n_external_timestamps.attr,
+       &dev_attr_n_periodic_outputs.attr,
+       &dev_attr_n_programmable_pins.attr,
+       &dev_attr_pps_available.attr,
+
+       &dev_attr_extts_enable.attr,
+       &dev_attr_fifo.attr,
+       &dev_attr_period.attr,
+       &dev_attr_pps_enable.attr,
+       NULL
+};
+
+static umode_t ptp_is_attribute_visible(struct kobject *kobj,
+                                       struct attribute *attr, int n)
+{
+       struct device *dev = kobj_to_dev(kobj);
+       struct ptp_clock *ptp = dev_get_drvdata(dev);
+       struct ptp_clock_info *info = ptp->info;
+       umode_t mode = attr->mode;
+
+       if (attr == &dev_attr_extts_enable.attr ||
+           attr == &dev_attr_fifo.attr) {
+               if (!info->n_ext_ts)
+                       mode = 0;
+       } else if (attr == &dev_attr_period.attr) {
+               if (!info->n_per_out)
+                       mode = 0;
+       } else if (attr == &dev_attr_pps_enable.attr) {
+               if (!info->pps)
+                       mode = 0;
+       }
+
+       return mode;
+}
+
+static const struct attribute_group ptp_group = {
+       .is_visible     = ptp_is_attribute_visible,
+       .attrs          = ptp_attrs,
+};
+
+const struct attribute_group *ptp_groups[] = {
+       &ptp_group,
+       NULL
+};
 
 static int ptp_pin_name2index(struct ptp_clock *ptp, const char *name)
 {
@@ -235,47 +268,20 @@ static ssize_t ptp_pin_store(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static DEVICE_ATTR(extts_enable, 0220, NULL, extts_enable_store);
-static DEVICE_ATTR(fifo,         0444, extts_fifo_show, NULL);
-static DEVICE_ATTR(period,       0220, NULL, period_store);
-static DEVICE_ATTR(pps_enable,   0220, NULL, pps_enable_store);
-
-int ptp_cleanup_sysfs(struct ptp_clock *ptp)
+int ptp_populate_pin_groups(struct ptp_clock *ptp)
 {
-       struct device *dev = ptp->dev;
-       struct ptp_clock_info *info = ptp->info;
-
-       if (info->n_ext_ts) {
-               device_remove_file(dev, &dev_attr_extts_enable);
-               device_remove_file(dev, &dev_attr_fifo);
-       }
-       if (info->n_per_out)
-               device_remove_file(dev, &dev_attr_period);
-
-       if (info->pps)
-               device_remove_file(dev, &dev_attr_pps_enable);
-
-       if (info->n_pins) {
-               sysfs_remove_group(&dev->kobj, &ptp->pin_attr_group);
-               kfree(ptp->pin_attr);
-               kfree(ptp->pin_dev_attr);
-       }
-       return 0;
-}
-
-static int ptp_populate_pins(struct ptp_clock *ptp)
-{
-       struct device *dev = ptp->dev;
        struct ptp_clock_info *info = ptp->info;
        int err = -ENOMEM, i, n_pins = info->n_pins;
 
-       ptp->pin_dev_attr = kzalloc(n_pins * sizeof(*ptp->pin_dev_attr),
+       if (!n_pins)
+               return 0;
+
+       ptp->pin_dev_attr = kcalloc(n_pins, sizeof(*ptp->pin_dev_attr),
                                    GFP_KERNEL);
        if (!ptp->pin_dev_attr)
                goto no_dev_attr;
 
-       ptp->pin_attr = kzalloc((1 + n_pins) * sizeof(struct attribute *),
-                               GFP_KERNEL);
+       ptp->pin_attr = kcalloc(1 + n_pins, sizeof(*ptp->pin_attr), GFP_KERNEL);
        if (!ptp->pin_attr)
                goto no_pin_attr;
 
@@ -292,61 +298,18 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
        ptp->pin_attr_group.name = "pins";
        ptp->pin_attr_group.attrs = ptp->pin_attr;
 
-       err = sysfs_create_group(&dev->kobj, &ptp->pin_attr_group);
-       if (err)
-               goto no_group;
+       ptp->pin_attr_groups[0] = &ptp->pin_attr_group;
+
        return 0;
 
-no_group:
-       kfree(ptp->pin_attr);
 no_pin_attr:
        kfree(ptp->pin_dev_attr);
 no_dev_attr:
        return err;
 }
 
-int ptp_populate_sysfs(struct ptp_clock *ptp)
+void ptp_cleanup_pin_groups(struct ptp_clock *ptp)
 {
-       struct device *dev = ptp->dev;
-       struct ptp_clock_info *info = ptp->info;
-       int err;
-
-       if (info->n_ext_ts) {
-               err = device_create_file(dev, &dev_attr_extts_enable);
-               if (err)
-                       goto out1;
-               err = device_create_file(dev, &dev_attr_fifo);
-               if (err)
-                       goto out2;
-       }
-       if (info->n_per_out) {
-               err = device_create_file(dev, &dev_attr_period);
-               if (err)
-                       goto out3;
-       }
-       if (info->pps) {
-               err = device_create_file(dev, &dev_attr_pps_enable);
-               if (err)
-                       goto out4;
-       }
-       if (info->n_pins) {
-               err = ptp_populate_pins(ptp);
-               if (err)
-                       goto out5;
-       }
-       return 0;
-out5:
-       if (info->pps)
-               device_remove_file(dev, &dev_attr_pps_enable);
-out4:
-       if (info->n_per_out)
-               device_remove_file(dev, &dev_attr_period);
-out3:
-       if (info->n_ext_ts)
-               device_remove_file(dev, &dev_attr_fifo);
-out2:
-       if (info->n_ext_ts)
-               device_remove_file(dev, &dev_attr_extts_enable);
-out1:
-       return err;
+       kfree(ptp->pin_attr);
+       kfree(ptp->pin_dev_attr);
 }