diff options
| author | Alexander Shishkin <alexander.shishkin@linux.intel.com> | 2016-02-15 19:11:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-20 14:09:14 -0800 |
| commit | d7b1787161b78a5125cbb91d0f7512612bb642ad (patch) | |
| tree | 6fdd47dae2265efe43c3530d7937cab6a151abed | |
| parent | 97007500ec3f9b08913ebec986068b9d250a6eed (diff) | |
| download | op-kernel-dev-d7b1787161b78a5125cbb91d0f7512612bb642ad.zip op-kernel-dev-d7b1787161b78a5125cbb91d0f7512612bb642ad.tar.gz | |
intel_th: Set root device's drvdata early
Already during the subdevice initialization time, devices will need
to reference Intel TH controller descriptor structure.
This patch moves setting the drvdata from the pci glue to intel_th
core, before subdevices are populated.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/hwtracing/intel_th/core.c | 2 | ||||
| -rw-r--r-- | drivers/hwtracing/intel_th/pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c index b8b9895..6df3cd9 100644 --- a/drivers/hwtracing/intel_th/core.c +++ b/drivers/hwtracing/intel_th/core.c @@ -584,6 +584,8 @@ intel_th_alloc(struct device *dev, struct resource *devres, } th->dev = dev; + dev_set_drvdata(dev, th); + err = intel_th_populate(th, devres, ndevres, irq); if (err) goto err_chrdev; diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c index 0901707..bca7a2a 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -46,8 +46,6 @@ static int intel_th_pci_probe(struct pci_dev *pdev, if (IS_ERR(th)) return PTR_ERR(th); - pci_set_drvdata(pdev, th); - return 0; } |
