android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ptp: create "pins" together with the rest of attributes

Browse Source 
Let's switch to using device_create_with_groups(), which will allow us to
create "pins" attribute group together with the rest of ptp device
attributes, and before userspace gets notified about ptp device creation.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dmitry Torokhov 2017-02-14 10:23:34 -08:00 committed by David S. Miller
parent af59e717d5
commit 85a66e5501
3 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/ptp/ptp_clock.c
View File

@ -221,16 +221,17 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
mutex_init(&ptp->pincfg_mux); mutex_init(&ptp->pincfg_mux);
init_waitqueue_head(&ptp->tsev_wq); init_waitqueue_head(&ptp->tsev_wq);
err = ptp_populate_pin_groups(ptp);
if (err)
goto no_pin_groups;
/* Create a new device in our class. */ /* Create a new device in our class. */
ptp->dev = device_create(ptp_class, parent, ptp->devid, ptp, ptp->dev = device_create_with_groups(ptp_class, parent, ptp->devid,
"ptp%d", ptp->index); ptp, ptp->pin_attr_groups,
"ptp%d", ptp->index);
if (IS_ERR(ptp->dev)) if (IS_ERR(ptp->dev))
goto no_device; goto no_device;
err = ptp_populate_sysfs(ptp);
if (err)
goto no_sysfs;
/* Register a new PPS source. */ /* Register a new PPS source. */
if (info->pps) { if (info->pps) {
struct pps_source_info pps; struct pps_source_info pps;
@ -258,10 +259,10 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
if (ptp->pps_source) if (ptp->pps_source)
pps_unregister_source(ptp->pps_source); pps_unregister_source(ptp->pps_source);
no_pps: no_pps:
ptp_cleanup_sysfs(ptp);
no_sysfs:
device_destroy(ptp_class, ptp->devid); device_destroy(ptp_class, ptp->devid);
no_device: no_device:
ptp_cleanup_pin_groups(ptp);
no_pin_groups:
mutex_destroy(&ptp->tsevq_mux); mutex_destroy(&ptp->tsevq_mux);
mutex_destroy(&ptp->pincfg_mux); mutex_destroy(&ptp->pincfg_mux);
ida_simple_remove(&ptp_clocks_map, index); ida_simple_remove(&ptp_clocks_map, index);
@ -280,8 +281,9 @@ int ptp_clock_unregister(struct ptp_clock *ptp)
/* Release the clock's resources. */ /* Release the clock's resources. */
if (ptp->pps_source) if (ptp->pps_source)
pps_unregister_source(ptp->pps_source); pps_unregister_source(ptp->pps_source);
ptp_cleanup_sysfs(ptp);
device_destroy(ptp_class, ptp->devid); device_destroy(ptp_class, ptp->devid);
ptp_cleanup_pin_groups(ptp);
posix_clock_unregister(&ptp->clock); posix_clock_unregister(&ptp->clock);
return 0; return 0;

7
drivers/ptp/ptp_private.h
View File

@ -54,6 +54,8 @@ struct ptp_clock {
struct device_attribute *pin_dev_attr; struct device_attribute *pin_dev_attr;
struct attribute **pin_attr; struct attribute **pin_attr;
struct attribute_group pin_attr_group; struct attribute_group pin_attr_group;
/* 1st entry is a pointer to the real group, 2nd is NULL terminator */
const struct attribute_group *pin_attr_groups[2];
}; };
/* /*
@ -94,8 +96,7 @@ uint ptp_poll(struct posix_clock *pc,
extern const struct attribute_group *ptp_groups[]; extern const struct attribute_group *ptp_groups[];
int ptp_cleanup_sysfs(struct ptp_clock *ptp); int ptp_populate_pin_groups(struct ptp_clock *ptp);
void ptp_cleanup_pin_groups(struct ptp_clock *ptp);
int ptp_populate_sysfs(struct ptp_clock *ptp);
#endif #endif

39
drivers/ptp/ptp_sysfs.c
View File

@ -268,25 +268,14 @@ static ssize_t ptp_pin_store(struct device *dev, struct device_attribute *attr,
return count; return count;
} }
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_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; struct ptp_clock_info *info = ptp->info;
int err = -ENOMEM, i, n_pins = info->n_pins; int err = -ENOMEM, i, n_pins = info->n_pins;
if (!n_pins)
return 0;
ptp->pin_dev_attr = kcalloc(n_pins, sizeof(*ptp->pin_dev_attr), ptp->pin_dev_attr = kcalloc(n_pins, sizeof(*ptp->pin_dev_attr),
GFP_KERNEL); GFP_KERNEL);
if (!ptp->pin_dev_attr) if (!ptp->pin_dev_attr)
@ -309,28 +298,18 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
ptp->pin_attr_group.name = "pins"; ptp->pin_attr_group.name = "pins";
ptp->pin_attr_group.attrs = ptp->pin_attr; ptp->pin_attr_group.attrs = ptp->pin_attr;
err = sysfs_create_group(&dev->kobj, &ptp->pin_attr_group); ptp->pin_attr_groups[0] = &ptp->pin_attr_group;
if (err)
goto no_group;
return 0; return 0;
no_group:
kfree(ptp->pin_attr);
no_pin_attr: no_pin_attr:
kfree(ptp->pin_dev_attr); kfree(ptp->pin_dev_attr);
no_dev_attr: no_dev_attr:
return err; return err;
} }
int ptp_populate_sysfs(struct ptp_clock *ptp) void ptp_cleanup_pin_groups(struct ptp_clock *ptp)
{ {
struct ptp_clock_info *info = ptp->info; kfree(ptp->pin_attr);
int err; kfree(ptp->pin_dev_attr);
if (info->n_pins) {
err = ptp_populate_pins(ptp);
if (err)
return err;
}
return 0;
} }