diff options
author | Minskey Guo <chaohong_guo@linux.intel.com> | 2010-05-02 15:52:35 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-02 15:52:35 -0400 |
commit | c86e1401c9f2ba8d989fa1c4b33d0f0ec3ba8aaf (patch) | |
tree | f835f2fa83130eecc9e0a2d2e218e6f942bf134e | |
parent | 2adfc550b6d9646301c810643bc309fa49375987 (diff) |
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.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/dma/ioat/pci.c b/drivers/dma/ioat/pci.c index 99ec26725bae..fab37d1cf48d 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 | |||
138 | if (err) | 138 | if (err) |
139 | return err; | 139 | return err; |
140 | 140 | ||
141 | device = devm_kzalloc(dev, sizeof(*device), GFP_KERNEL); | ||
142 | if (!device) | ||
143 | return -ENOMEM; | ||
144 | |||
145 | pci_set_master(pdev); | ||
146 | |||
147 | device = alloc_ioatdma(pdev, iomap[IOAT_MMIO_BAR]); | 141 | device = alloc_ioatdma(pdev, iomap[IOAT_MMIO_BAR]); |
148 | if (!device) | 142 | if (!device) |
149 | return -ENOMEM; | 143 | return -ENOMEM; |
144 | pci_set_master(pdev); | ||
150 | pci_set_drvdata(pdev, device); | 145 | pci_set_drvdata(pdev, device); |
151 | 146 | ||
152 | device->version = readb(device->reg_base + IOAT_VER_OFFSET); | 147 | device->version = readb(device->reg_base + IOAT_VER_OFFSET); |