5554b35933
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (24 commits)
I/OAT: I/OAT version 3.0 support
I/OAT: tcp_dma_copybreak default value dependent on I/OAT version
I/OAT: Add watchdog/reset functionality to ioatdma
iop_adma: cleanup iop_chan_xor_slot_count
iop_adma: document how to calculate the minimum descriptor pool size
iop_adma: directly reclaim descriptors on allocation failure
async_tx: make async_tx_test_ack a boolean routine
async_tx: remove depend_tx from async_tx_sync_epilog
async_tx: export async_tx_quiesce
async_tx: fix handling of the "out of descriptor" condition in async_xor
async_tx: ensure the xor destination buffer remains dma-mapped
async_tx: list_for_each_entry_rcu() cleanup
dmaengine: Driver for the Synopsys DesignWare DMA controller
dmaengine: Add slave DMA interface
dmaengine: add DMA_COMPL_SKIP_{SRC,DEST}_UNMAP flags to control dma unmap
dmaengine: Add dma_client parameter to device_alloc_chan_resources
dmatest: Simple DMA memcpy test client
dmaengine: DMA engine driver for Marvell XOR engine
iop-adma: fix platform driver hotplug/coldplug
dmaengine: track the number of clients using a channel
...
Fixed up conflict in drivers/dca/dca-sysfs.c manually
91 lines
1.8 KiB
C
91 lines
1.8 KiB
C
#include <linux/kernel.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/device.h>
|
|
#include <linux/idr.h>
|
|
#include <linux/kdev_t.h>
|
|
#include <linux/err.h>
|
|
#include <linux/dca.h>
|
|
|
|
static struct class *dca_class;
|
|
static struct idr dca_idr;
|
|
static spinlock_t dca_idr_lock;
|
|
|
|
int dca_sysfs_add_req(struct dca_provider *dca, struct device *dev, int slot)
|
|
{
|
|
struct device *cd;
|
|
static int req_count;
|
|
|
|
cd = device_create_drvdata(dca_class, dca->cd,
|
|
MKDEV(0, slot + 1), NULL,
|
|
"requester%d", req_count++);
|
|
if (IS_ERR(cd))
|
|
return PTR_ERR(cd);
|
|
return 0;
|
|
}
|
|
|
|
void dca_sysfs_remove_req(struct dca_provider *dca, int slot)
|
|
{
|
|
device_destroy(dca_class, MKDEV(0, slot + 1));
|
|
}
|
|
|
|
int dca_sysfs_add_provider(struct dca_provider *dca, struct device *dev)
|
|
{
|
|
struct device *cd;
|
|
int err = 0;
|
|
|
|
idr_try_again:
|
|
if (!idr_pre_get(&dca_idr, GFP_KERNEL))
|
|
return -ENOMEM;
|
|
spin_lock(&dca_idr_lock);
|
|
err = idr_get_new(&dca_idr, dca, &dca->id);
|
|
spin_unlock(&dca_idr_lock);
|
|
switch (err) {
|
|
case 0:
|
|
break;
|
|
case -EAGAIN:
|
|
goto idr_try_again;
|
|
default:
|
|
return err;
|
|
}
|
|
|
|
cd = device_create_drvdata(dca_class, dev, MKDEV(0, 0), NULL,
|
|
"dca%d", dca->id);
|
|
if (IS_ERR(cd)) {
|
|
spin_lock(&dca_idr_lock);
|
|
idr_remove(&dca_idr, dca->id);
|
|
spin_unlock(&dca_idr_lock);
|
|
return PTR_ERR(cd);
|
|
}
|
|
dca->cd = cd;
|
|
return 0;
|
|
}
|
|
|
|
void dca_sysfs_remove_provider(struct dca_provider *dca)
|
|
{
|
|
device_unregister(dca->cd);
|
|
dca->cd = NULL;
|
|
spin_lock(&dca_idr_lock);
|
|
idr_remove(&dca_idr, dca->id);
|
|
spin_unlock(&dca_idr_lock);
|
|
}
|
|
|
|
int __init dca_sysfs_init(void)
|
|
{
|
|
idr_init(&dca_idr);
|
|
spin_lock_init(&dca_idr_lock);
|
|
|
|
dca_class = class_create(THIS_MODULE, "dca");
|
|
if (IS_ERR(dca_class)) {
|
|
idr_destroy(&dca_idr);
|
|
return PTR_ERR(dca_class);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void __exit dca_sysfs_exit(void)
|
|
{
|
|
class_destroy(dca_class);
|
|
idr_destroy(&dca_idr);
|
|
}
|
|
|