summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinskey Guo <chaohong_guo@linux.intel.com>2010-05-02 12:52:35 -0700
committerDan Williams <dan.j.williams@intel.com>2010-05-02 12:52:35 -0700
commitc86e1401c9f2ba8d989fa1c4b33d0f0ec3ba8aaf (patch)
treef835f2fa83130eecc9e0a2d2e218e6f942bf134e
parent2adfc550b6d9646301c810643bc309fa49375987 (diff)
downloadop-kernel-dev-c86e1401c9f2ba8d989fa1c4b33d0f0ec3ba8aaf.zip
op-kernel-dev-c86e1401c9f2ba8d989fa1c4b33d0f0ec3ba8aaf.tar.gz
ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device
The memory for ioatdma_device structure is being allocated in alloc_ioatdma() Signed-off-by: Minskey Guo <chaohong_guo@linux.intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/dma/ioat/pci.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/dma/ioat/pci.c b/drivers/dma/ioat/pci.c
index 99ec267..fab37d1 100644
--- a/drivers/dma/ioat/pci.c
+++ b/drivers/dma/ioat/pci.c
@@ -138,15 +138,10 @@ static int __devinit ioat_pci_probe(struct pci_dev *pdev, const struct pci_devic
if (err)
return err;
- device = devm_kzalloc(dev, sizeof(*device), GFP_KERNEL);
- if (!device)
- return -ENOMEM;
-
- pci_set_master(pdev);
-
device = alloc_ioatdma(pdev, iomap[IOAT_MMIO_BAR]);
if (!device)
return -ENOMEM;
+ pci_set_master(pdev);
pci_set_drvdata(pdev, device);
device->version = readb(device->reg_base + IOAT_VER_OFFSET);
OpenPOWER on IntegriCloud