Commit 09433f24 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/abi16: remove unused argument from nouveau_abi16_get() 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b41c4857

drivers/gpu/drm/nouveau/nouveau_abi16.c

+6 −6
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "nouveau_abi16.h"



struct nouveau_abi16 *

nouveau_abi16_get(struct drm_file *file_priv, struct drm_device *dev)

nouveau_abi16_get(struct drm_file *file_priv)

{

	struct nouveau_cli *cli = nouveau_cli(file_priv);

	mutex_lock(&cli->mutex);
@@ -236,7 +236,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) 
	struct drm_nouveau_channel_alloc *init = data;

	struct nouveau_cli *cli = nouveau_cli(file_priv);

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);

	struct nouveau_abi16_chan *chan;

	struct nvif_device *device;

	int ret;
@@ -342,7 +342,7 @@ int 
nouveau_abi16_ioctl_channel_free(ABI16_IOCTL_ARGS)

{

	struct drm_nouveau_channel_free *req = data;

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);

	struct nouveau_abi16_chan *chan;



	if (unlikely(!abi16))
@@ -359,7 +359,7 @@ int 
nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS)

{

	struct drm_nouveau_grobj_alloc *init = data;

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);

	struct nouveau_abi16_chan *chan;

	struct nouveau_abi16_ntfy *ntfy;

	struct nvif_client *client;
@@ -452,7 +452,7 @@ nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS) 
{

	struct drm_nouveau_notifierobj_alloc *info = data;

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);

	struct nouveau_abi16_chan *chan;

	struct nouveau_abi16_ntfy *ntfy;

	struct nvif_device *device = &abi16->device;
@@ -524,7 +524,7 @@ int 
nouveau_abi16_ioctl_gpuobj_free(ABI16_IOCTL_ARGS)

{

	struct drm_nouveau_gpuobj_free *fini = data;

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);

	struct nouveau_abi16_chan *chan;

	struct nouveau_abi16_ntfy *ntfy;

	int ret = -ENOENT;

drivers/gpu/drm/nouveau/nouveau_abi16.h

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ struct nouveau_abi16 { 
	u64 handles;

};



struct nouveau_drm;

struct nouveau_abi16 *nouveau_abi16_get(struct drm_file *, struct drm_device *);

struct nouveau_abi16 *nouveau_abi16_get(struct drm_file *);

int  nouveau_abi16_put(struct nouveau_abi16 *, int);

void nouveau_abi16_fini(struct nouveau_abi16 *);

s32  nouveau_abi16_swclass(struct nouveau_drm *);

drivers/gpu/drm/nouveau/nouveau_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ int 
nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,

			  struct drm_file *file_priv)

{

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev);

	struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv);

	struct nouveau_cli *cli = nouveau_cli(file_priv);

	struct nouveau_abi16_chan *temp;

	struct nouveau_drm *drm = nouveau_drm(dev);