forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i810: use pci_zalloc_consistent

Browse source 
Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2014-08-08 14:24:19 -07:00 • committed by Linus Torvalds
parent 9011a67b2f
commit 59e2623b43
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/drm/i810/i810_dma.c
View file

@ -393,15 +393,14 @@ static int i810_dma_initialize(struct drm_device *dev,
/* Program Hardware Status Page */ /* Program Hardware Status Page */
dev_priv->hw_status_page = dev_priv->hw_status_page =
pci_alloc_consistent(dev->pdev, PAGE_SIZE, pci_zalloc_consistent(dev->pdev, PAGE_SIZE,
&dev_priv->dma_status_page); &dev_priv->dma_status_page);
if (!dev_priv->hw_status_page) { if (!dev_priv->hw_status_page) {
dev->dev_private = (void *)dev_priv; dev->dev_private = (void *)dev_priv;
i810_dma_cleanup(dev); i810_dma_cleanup(dev);
DRM_ERROR("Can not allocate hardware status page\n"); DRM_ERROR("Can not allocate hardware status page\n");
return -ENOMEM; return -ENOMEM;
} }
memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page); DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
I810_WRITE(0x02080, dev_priv->dma_status_page); I810_WRITE(0x02080, dev_priv->dma_status_page);