diff options
| author | Eric Anholt <eric@anholt.net> | 2007-08-25 06:23:09 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@optimus.(none)> | 2007-10-14 20:38:20 -0400 |
| commit | 6c340eac0285f3d62406d2d902d0e96fbf2a5dc0 (patch) | |
| tree | a92039951cb7eaced306cfff2bad6af0ac5257ad /drivers/char/drm/via_dma.c | |
| parent | 20caafa6ecb2487d9b223aa33e7cc704f912a758 (diff) | |
drm: Replace filp in ioctl arguments with drm_file *file_priv.
As a fallout, replace filp storage with file_priv storage for "unique
identifier of a client" all over the DRM. There is a 1:1 mapping, so this
should be a noop. This could be a minor performance improvement, as everyth
on Linux dereferenced filp to get file_priv anyway, while only the mmap ioct
went the other direction.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/via_dma.c')
| -rw-r--r-- | drivers/char/drm/via_dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c index 2d0035f83a7b..6d3e4eecf8f8 100644 --- a/drivers/char/drm/via_dma.c +++ b/drivers/char/drm/via_dma.c | |||
| @@ -330,7 +330,7 @@ static int via_flush_ioctl(DRM_IOCTL_ARGS) | |||
| 330 | { | 330 | { |
| 331 | DRM_DEVICE; | 331 | DRM_DEVICE; |
| 332 | 332 | ||
| 333 | LOCK_TEST_WITH_RETURN(dev, filp); | 333 | LOCK_TEST_WITH_RETURN(dev, file_priv); |
| 334 | 334 | ||
| 335 | return via_driver_dma_quiescent(dev); | 335 | return via_driver_dma_quiescent(dev); |
| 336 | } | 336 | } |
| @@ -341,7 +341,7 @@ static int via_cmdbuffer(DRM_IOCTL_ARGS) | |||
| 341 | drm_via_cmdbuffer_t cmdbuf; | 341 | drm_via_cmdbuffer_t cmdbuf; |
| 342 | int ret; | 342 | int ret; |
| 343 | 343 | ||
| 344 | LOCK_TEST_WITH_RETURN(dev, filp); | 344 | LOCK_TEST_WITH_RETURN(dev, file_priv); |
| 345 | 345 | ||
| 346 | DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data, | 346 | DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data, |
| 347 | sizeof(cmdbuf)); | 347 | sizeof(cmdbuf)); |
| @@ -386,7 +386,7 @@ static int via_pci_cmdbuffer(DRM_IOCTL_ARGS) | |||
| 386 | drm_via_cmdbuffer_t cmdbuf; | 386 | drm_via_cmdbuffer_t cmdbuf; |
| 387 | int ret; | 387 | int ret; |
| 388 | 388 | ||
| 389 | LOCK_TEST_WITH_RETURN(dev, filp); | 389 | LOCK_TEST_WITH_RETURN(dev, file_priv); |
| 390 | 390 | ||
| 391 | DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data, | 391 | DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data, |
| 392 | sizeof(cmdbuf)); | 392 | sizeof(cmdbuf)); |
| @@ -662,7 +662,7 @@ static int via_cmdbuf_size(DRM_IOCTL_ARGS) | |||
| 662 | drm_via_private_t *dev_priv; | 662 | drm_via_private_t *dev_priv; |
| 663 | 663 | ||
| 664 | DRM_DEBUG("via cmdbuf_size\n"); | 664 | DRM_DEBUG("via cmdbuf_size\n"); |
| 665 | LOCK_TEST_WITH_RETURN(dev, filp); | 665 | LOCK_TEST_WITH_RETURN(dev, file_priv); |
| 666 | 666 | ||
| 667 | dev_priv = (drm_via_private_t *) dev->dev_private; | 667 | dev_priv = (drm_via_private_t *) dev->dev_private; |
| 668 | 668 | ||