mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
ptp: link the phc device to its parent device
PTP Hardware Clock devices appear as class devices in sysfs. This patch changes the registration API to use the parent device, clarifying the clock's relationship to the underlying device. Signed-off-by: Richard Cochran <[email protected]> Acked-by: Ben Hutchings <[email protected]> Acked-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
5c35bad5ff
commit
1ef761582c
9 changed files with 18 additions and 11 deletions
|
|
@ -182,7 +182,8 @@ static void delete_ptp_clock(struct posix_clock *pc)
|
|||
|
||||
/* public interface */
|
||||
|
||||
struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info)
|
||||
struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
|
||||
struct device *parent)
|
||||
{
|
||||
struct ptp_clock *ptp;
|
||||
int err = 0, index, major = MAJOR(ptp_devt);
|
||||
|
|
@ -215,7 +216,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info)
|
|||
init_waitqueue_head(&ptp->tsev_wq);
|
||||
|
||||
/* Create a new device in our class. */
|
||||
ptp->dev = device_create(ptp_class, NULL, ptp->devid, ptp,
|
||||
ptp->dev = device_create(ptp_class, parent, ptp->devid, ptp,
|
||||
"ptp%d", ptp->index);
|
||||
if (IS_ERR(ptp->dev))
|
||||
goto no_device;
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ static int __init ptp_ixp_init(void)
|
|||
|
||||
ixp_clock.caps = ptp_ixp_caps;
|
||||
|
||||
ixp_clock.ptp_clock = ptp_clock_register(&ixp_clock.caps);
|
||||
ixp_clock.ptp_clock = ptp_clock_register(&ixp_clock.caps, NULL);
|
||||
|
||||
if (IS_ERR(ixp_clock.ptp_clock))
|
||||
return PTR_ERR(ixp_clock.ptp_clock);
|
||||
|
|
|
|||
|
|
@ -627,7 +627,7 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
}
|
||||
|
||||
chip->caps = ptp_pch_caps;
|
||||
chip->ptp_clock = ptp_clock_register(&chip->caps);
|
||||
chip->ptp_clock = ptp_clock_register(&chip->caps, &pdev->dev);
|
||||
|
||||
if (IS_ERR(chip->ptp_clock))
|
||||
return PTR_ERR(chip->ptp_clock);
|
||||
|
|
|
|||
Loading…
Reference in a new issue