leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

counter: intel-qep: Convert to new counter registration

Browse Source 
This fixes device lifetime issues where it was possible to free a live
struct device.

Fixes: b711f687a1 ("counter: Add support for Intel Quadrature Encoder Peripheral")
Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20211230150300.72196-18-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Uwe Kleine-König
2021-12-30 16:02:54 +01:00
committed by Greg Kroah-Hartman
parent aefc7e1797
commit e99dec87a9
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/counter/intel-qep.c
View File

@@ -63,7 +63,6 @@
#define INTEL_QEP_CLK_PERIOD_NS 10 #define INTEL_QEP_CLK_PERIOD_NS 10
struct intel_qep { struct intel_qep {
struct counter_device counter;
struct mutex lock; struct mutex lock;
struct device *dev; struct device *dev;
void __iomem *regs; void __iomem *regs;
@@ -392,14 +391,16 @@ static struct counter_count intel_qep_counter_count[] = {
static int intel_qep_probe(struct pci_dev *pci, const struct pci_device_id *id) static int intel_qep_probe(struct pci_dev *pci, const struct pci_device_id *id)
{ {
struct counter_device *counter;
struct intel_qep *qep; struct intel_qep *qep;
struct device *dev = &pci->dev; struct device *dev = &pci->dev;
void __iomem *regs; void __iomem *regs;
int ret; int ret;
qep = devm_kzalloc(dev, sizeof(*qep), GFP_KERNEL); counter = devm_counter_alloc(dev, sizeof(*qep));
if (!qep) if (!counter)
return -ENOMEM; return -ENOMEM;
qep = counter_priv(counter);
ret = pcim_enable_device(pci); ret = pcim_enable_device(pci);
if (ret) if (ret)
@@ -422,20 +423,23 @@ static int intel_qep_probe(struct pci_dev *pci, const struct pci_device_id *id)
intel_qep_init(qep); intel_qep_init(qep);
pci_set_drvdata(pci, qep); pci_set_drvdata(pci, qep);
qep->counter.name = pci_name(pci); counter->name = pci_name(pci);
qep->counter.parent = dev; counter->parent = dev;
qep->counter.ops = &intel_qep_counter_ops; counter->ops = &intel_qep_counter_ops;
qep->counter.counts = intel_qep_counter_count; counter->counts = intel_qep_counter_count;
qep->counter.num_counts = ARRAY_SIZE(intel_qep_counter_count); counter->num_counts = ARRAY_SIZE(intel_qep_counter_count);
qep->counter.signals = intel_qep_signals; counter->signals = intel_qep_signals;
qep->counter.num_signals = ARRAY_SIZE(intel_qep_signals); counter->num_signals = ARRAY_SIZE(intel_qep_signals);
qep->counter.priv = qep;
qep->enabled = false; qep->enabled = false;
pm_runtime_put(dev); pm_runtime_put(dev);
pm_runtime_allow(dev); pm_runtime_allow(dev);
return devm_counter_register(&pci->dev, &qep->counter); ret = devm_counter_add(&pci->dev, counter);
if (ret < 0)
return dev_err_probe(&pci->dev, ret, "Failed to add counter\n");
return 0;
} }
static void intel_qep_remove(struct pci_dev *pci) static void intel_qep_remove(struct pci_dev *pci)