mirror of
https://github.com/torvalds/linux.git
synced 2026-04-26 18:42:25 -04:00
bf4afc53b7
This was done entirely with mindless brute force, using
git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' |
xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/'
to convert the new alloc_obj() users that had a simple GFP_KERNEL
argument to just drop that argument.
Note that due to the extreme simplicity of the scripting, any slightly
more complex cases spread over multiple lines would not be triggered:
they definitely exist, but this covers the vast bulk of the cases, and
the resulting diff is also then easier to check automatically.
For the same reason the 'flex' versions will be done as a separate
conversion.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
117 lines
3.3 KiB
C
117 lines
3.3 KiB
C
/*
|
|
* Copyright 2012 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors: Ben Skeggs
|
|
*/
|
|
#include "priv.h"
|
|
|
|
#include <core/client.h>
|
|
#include <engine/fifo.h>
|
|
|
|
#include <nvif/class.h>
|
|
|
|
static int
|
|
nvkm_dma_oclass_new(struct nvkm_device *device,
|
|
const struct nvkm_oclass *oclass, void *data, u32 size,
|
|
struct nvkm_object **pobject)
|
|
{
|
|
struct nvkm_dma *dma = nvkm_dma(oclass->engine);
|
|
struct nvkm_dmaobj *dmaobj = NULL;
|
|
int ret;
|
|
|
|
ret = dma->func->class_new(dma, oclass, data, size, &dmaobj);
|
|
if (dmaobj)
|
|
*pobject = &dmaobj->object;
|
|
return ret;
|
|
}
|
|
|
|
static const struct nvkm_device_oclass
|
|
nvkm_dma_oclass_base = {
|
|
.ctor = nvkm_dma_oclass_new,
|
|
};
|
|
|
|
static int
|
|
nvkm_dma_oclass_fifo_new(const struct nvkm_oclass *oclass, void *data, u32 size,
|
|
struct nvkm_object **pobject)
|
|
{
|
|
return nvkm_dma_oclass_new(oclass->engine->subdev.device,
|
|
oclass, data, size, pobject);
|
|
}
|
|
|
|
static const struct nvkm_sclass
|
|
nvkm_dma_sclass[] = {
|
|
{ 0, 0, NV_DMA_FROM_MEMORY, NULL, nvkm_dma_oclass_fifo_new },
|
|
{ 0, 0, NV_DMA_TO_MEMORY, NULL, nvkm_dma_oclass_fifo_new },
|
|
{ 0, 0, NV_DMA_IN_MEMORY, NULL, nvkm_dma_oclass_fifo_new },
|
|
};
|
|
|
|
static int
|
|
nvkm_dma_oclass_base_get(struct nvkm_oclass *sclass, int index,
|
|
const struct nvkm_device_oclass **class)
|
|
{
|
|
const int count = ARRAY_SIZE(nvkm_dma_sclass);
|
|
if (index < count) {
|
|
const struct nvkm_sclass *oclass = &nvkm_dma_sclass[index];
|
|
sclass->base = oclass[0];
|
|
sclass->engn = oclass;
|
|
*class = &nvkm_dma_oclass_base;
|
|
return index;
|
|
}
|
|
return count;
|
|
}
|
|
|
|
static int
|
|
nvkm_dma_oclass_fifo_get(struct nvkm_oclass *oclass, int index)
|
|
{
|
|
const int count = ARRAY_SIZE(nvkm_dma_sclass);
|
|
if (index < count) {
|
|
oclass->base = nvkm_dma_sclass[index];
|
|
return index;
|
|
}
|
|
return count;
|
|
}
|
|
|
|
static void *
|
|
nvkm_dma_dtor(struct nvkm_engine *engine)
|
|
{
|
|
return nvkm_dma(engine);
|
|
}
|
|
|
|
static const struct nvkm_engine_func
|
|
nvkm_dma = {
|
|
.dtor = nvkm_dma_dtor,
|
|
.base.sclass = nvkm_dma_oclass_base_get,
|
|
.fifo.sclass = nvkm_dma_oclass_fifo_get,
|
|
};
|
|
|
|
int
|
|
nvkm_dma_new_(const struct nvkm_dma_func *func, struct nvkm_device *device,
|
|
enum nvkm_subdev_type type, int inst, struct nvkm_dma **pdma)
|
|
{
|
|
struct nvkm_dma *dma;
|
|
|
|
if (!(dma = *pdma = kzalloc_obj(*dma)))
|
|
return -ENOMEM;
|
|
dma->func = func;
|
|
|
|
return nvkm_engine_ctor(&nvkm_dma, device, type, inst, true, &dma->engine);
|
|
}
|