Skip to content

Commit 09433f2

Browse files
author
Ben Skeggs
committed
drm/nouveau/abi16: remove unused argument from nouveau_abi16_get()
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
1 parent b41c485 commit 09433f2

3 files changed

Lines changed: 8 additions & 9 deletions

File tree

drivers/gpu/drm/nouveau/nouveau_abi16.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "nouveau_abi16.h"
3434

3535
struct nouveau_abi16 *
36-
nouveau_abi16_get(struct drm_file *file_priv, struct drm_device *dev)
36+
nouveau_abi16_get(struct drm_file *file_priv)
3737
{
3838
struct nouveau_cli *cli = nouveau_cli(file_priv);
3939
mutex_lock(&cli->mutex);
@@ -236,7 +236,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
236236
struct drm_nouveau_channel_alloc *init = data;
237237
struct nouveau_cli *cli = nouveau_cli(file_priv);
238238
struct nouveau_drm *drm = nouveau_drm(dev);
239-
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);
239+
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);
240240
struct nouveau_abi16_chan *chan;
241241
struct nvif_device *device;
242242
int ret;
@@ -342,7 +342,7 @@ int
342342
nouveau_abi16_ioctl_channel_free(ABI16_IOCTL_ARGS)
343343
{
344344
struct drm_nouveau_channel_free *req = data;
345-
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);
345+
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);
346346
struct nouveau_abi16_chan *chan;
347347

348348
if (unlikely(!abi16))
@@ -359,7 +359,7 @@ int
359359
nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS)
360360
{
361361
struct drm_nouveau_grobj_alloc *init = data;
362-
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);
362+
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);
363363
struct nouveau_abi16_chan *chan;
364364
struct nouveau_abi16_ntfy *ntfy;
365365
struct nvif_client *client;
@@ -452,7 +452,7 @@ nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS)
452452
{
453453
struct drm_nouveau_notifierobj_alloc *info = data;
454454
struct nouveau_drm *drm = nouveau_drm(dev);
455-
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);
455+
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);
456456
struct nouveau_abi16_chan *chan;
457457
struct nouveau_abi16_ntfy *ntfy;
458458
struct nvif_device *device = &abi16->device;
@@ -524,7 +524,7 @@ int
524524
nouveau_abi16_ioctl_gpuobj_free(ABI16_IOCTL_ARGS)
525525
{
526526
struct drm_nouveau_gpuobj_free *fini = data;
527-
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);
527+
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);
528528
struct nouveau_abi16_chan *chan;
529529
struct nouveau_abi16_ntfy *ntfy;
530530
int ret = -ENOENT;

drivers/gpu/drm/nouveau/nouveau_abi16.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ struct nouveau_abi16 {
3333
u64 handles;
3434
};
3535

36-
struct nouveau_drm;
37-
struct nouveau_abi16 *nouveau_abi16_get(struct drm_file *, struct drm_device *);
36+
struct nouveau_abi16 *nouveau_abi16_get(struct drm_file *);
3837
int nouveau_abi16_put(struct nouveau_abi16 *, int);
3938
void nouveau_abi16_fini(struct nouveau_abi16 *);
4039
s32 nouveau_abi16_swclass(struct nouveau_drm *);

drivers/gpu/drm/nouveau/nouveau_gem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ int
668668
nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
669669
struct drm_file *file_priv)
670670
{
671-
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);
671+
struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);
672672
struct nouveau_cli *cli = nouveau_cli(file_priv);
673673
struct nouveau_abi16_chan *temp;
674674
struct nouveau_drm *drm = nouveau_drm(dev);

0 commit comments

Comments
 (0)