forked from Minki/linux
sh: dma - convert sysdev_class to a regular subsystem
After all sysdev classes are ported to regular driver core entities, the sysdev implementation will be entirely removed from the kernel. Cc: Paul Mundt <lethal@linux-sh.org> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers
Greg Kroah-Hartman
parent
f4e73bfcd9
commit
dc6876a288
@ -12,18 +12,19 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/stat.h>
|
||||
#include <linux/sysdev.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/string.h>
|
||||
#include <asm/dma.h>
|
||||
|
||||
static struct sysdev_class dma_sysclass = {
|
||||
static struct bus_type dma_subsys = {
|
||||
.name = "dma",
|
||||
.dev_name = "dma",
|
||||
};
|
||||
|
||||
static ssize_t dma_show_devices(struct sys_device *dev,
|
||||
struct sysdev_attribute *attr, char *buf)
|
||||
static ssize_t dma_show_devices(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
ssize_t len = 0;
|
||||
int i;
|
||||
@ -43,29 +44,29 @@ static ssize_t dma_show_devices(struct sys_device *dev,
|
||||
return len;
|
||||
}
|
||||
|
||||
static SYSDEV_ATTR(devices, S_IRUGO, dma_show_devices, NULL);
|
||||
static DEVICE_ATTR(devices, S_IRUGO, dma_show_devices, NULL);
|
||||
|
||||
static int __init dma_sysclass_init(void)
|
||||
static int __init dma_subsys_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = sysdev_class_register(&dma_sysclass);
|
||||
ret = subsys_system_register(&dma_subsys, NULL);
|
||||
if (unlikely(ret))
|
||||
return ret;
|
||||
|
||||
return sysfs_create_file(&dma_sysclass.kset.kobj, &attr_devices.attr);
|
||||
return device_create_file(dma_subsys.dev_root, &dev_attr_devices.attr);
|
||||
}
|
||||
postcore_initcall(dma_sysclass_init);
|
||||
postcore_initcall(dma_subsys_init);
|
||||
|
||||
static ssize_t dma_show_dev_id(struct sys_device *dev,
|
||||
struct sysdev_attribute *attr, char *buf)
|
||||
static ssize_t dma_show_dev_id(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct dma_channel *channel = to_dma_channel(dev);
|
||||
return sprintf(buf, "%s\n", channel->dev_id);
|
||||
}
|
||||
|
||||
static ssize_t dma_store_dev_id(struct sys_device *dev,
|
||||
struct sysdev_attribute *attr,
|
||||
static ssize_t dma_store_dev_id(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct dma_channel *channel = to_dma_channel(dev);
|
||||
@ -73,10 +74,10 @@ static ssize_t dma_store_dev_id(struct sys_device *dev,
|
||||
return count;
|
||||
}
|
||||
|
||||
static SYSDEV_ATTR(dev_id, S_IRUGO | S_IWUSR, dma_show_dev_id, dma_store_dev_id);
|
||||
static DEVICE_ATTR(dev_id, S_IRUGO | S_IWUSR, dma_show_dev_id, dma_store_dev_id);
|
||||
|
||||
static ssize_t dma_store_config(struct sys_device *dev,
|
||||
struct sysdev_attribute *attr,
|
||||
static ssize_t dma_store_config(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct dma_channel *channel = to_dma_channel(dev);
|
||||
@ -88,17 +89,17 @@ static ssize_t dma_store_config(struct sys_device *dev,
|
||||
return count;
|
||||
}
|
||||
|
||||
static SYSDEV_ATTR(config, S_IWUSR, NULL, dma_store_config);
|
||||
static DEVICE_ATTR(config, S_IWUSR, NULL, dma_store_config);
|
||||
|
||||
static ssize_t dma_show_mode(struct sys_device *dev,
|
||||
struct sysdev_attribute *attr, char *buf)
|
||||
static ssize_t dma_show_mode(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct dma_channel *channel = to_dma_channel(dev);
|
||||
return sprintf(buf, "0x%08x\n", channel->mode);
|
||||
}
|
||||
|
||||
static ssize_t dma_store_mode(struct sys_device *dev,
|
||||
struct sysdev_attribute *attr,
|
||||
static ssize_t dma_store_mode(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct dma_channel *channel = to_dma_channel(dev);
|
||||
@ -106,38 +107,38 @@ static ssize_t dma_store_mode(struct sys_device *dev,
|
||||
return count;
|
||||
}
|
||||
|
||||
static SYSDEV_ATTR(mode, S_IRUGO | S_IWUSR, dma_show_mode, dma_store_mode);
|
||||
static DEVICE_ATTR(mode, S_IRUGO | S_IWUSR, dma_show_mode, dma_store_mode);
|
||||
|
||||
#define dma_ro_attr(field, fmt) \
|
||||
static ssize_t dma_show_##field(struct sys_device *dev, \
|
||||
struct sysdev_attribute *attr, char *buf)\
|
||||
static ssize_t dma_show_##field(struct device *dev, \
|
||||
struct device_attribute *attr, char *buf)\
|
||||
{ \
|
||||
struct dma_channel *channel = to_dma_channel(dev); \
|
||||
return sprintf(buf, fmt, channel->field); \
|
||||
} \
|
||||
static SYSDEV_ATTR(field, S_IRUGO, dma_show_##field, NULL);
|
||||
static DEVICE_ATTR(field, S_IRUGO, dma_show_##field, NULL);
|
||||
|
||||
dma_ro_attr(count, "0x%08x\n");
|
||||
dma_ro_attr(flags, "0x%08lx\n");
|
||||
|
||||
int dma_create_sysfs_files(struct dma_channel *chan, struct dma_info *info)
|
||||
{
|
||||
struct sys_device *dev = &chan->dev;
|
||||
struct device *dev = &chan->dev;
|
||||
char name[16];
|
||||
int ret;
|
||||
|
||||
dev->id = chan->vchan;
|
||||
dev->cls = &dma_sysclass;
|
||||
dev->bus = &dma_subsys;
|
||||
|
||||
ret = sysdev_register(dev);
|
||||
ret = device_register(dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret |= sysdev_create_file(dev, &attr_dev_id);
|
||||
ret |= sysdev_create_file(dev, &attr_count);
|
||||
ret |= sysdev_create_file(dev, &attr_mode);
|
||||
ret |= sysdev_create_file(dev, &attr_flags);
|
||||
ret |= sysdev_create_file(dev, &attr_config);
|
||||
ret |= device_create_file(dev, &dev_attr_dev_id);
|
||||
ret |= device_create_file(dev, &dev_attr_count);
|
||||
ret |= device_create_file(dev, &dev_attr_mode);
|
||||
ret |= device_create_file(dev, &dev_attr_flags);
|
||||
ret |= device_create_file(dev, &dev_attr_config);
|
||||
|
||||
if (unlikely(ret)) {
|
||||
dev_err(&info->pdev->dev, "Failed creating attrs\n");
|
||||
@ -150,17 +151,17 @@ int dma_create_sysfs_files(struct dma_channel *chan, struct dma_info *info)
|
||||
|
||||
void dma_remove_sysfs_files(struct dma_channel *chan, struct dma_info *info)
|
||||
{
|
||||
struct sys_device *dev = &chan->dev;
|
||||
struct device *dev = &chan->dev;
|
||||
char name[16];
|
||||
|
||||
sysdev_remove_file(dev, &attr_dev_id);
|
||||
sysdev_remove_file(dev, &attr_count);
|
||||
sysdev_remove_file(dev, &attr_mode);
|
||||
sysdev_remove_file(dev, &attr_flags);
|
||||
sysdev_remove_file(dev, &attr_config);
|
||||
device_remove_file(dev, &dev_attr_dev_id);
|
||||
device_remove_file(dev, &dev_attr_count);
|
||||
device_remove_file(dev, &dev_attr_mode);
|
||||
device_remove_file(dev, &dev_attr_flags);
|
||||
device_remove_file(dev, &dev_attr_config);
|
||||
|
||||
snprintf(name, sizeof(name), "dma%d", chan->chan);
|
||||
sysfs_remove_link(&info->pdev->dev.kobj, name);
|
||||
|
||||
sysdev_unregister(dev);
|
||||
device_unregister(dev);
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/sysdev.h>
|
||||
#include <linux/device.h>
|
||||
#include <cpu/dma.h>
|
||||
#include <asm-generic/dma.h>
|
||||
|
||||
@ -91,7 +91,7 @@ struct dma_channel {
|
||||
|
||||
wait_queue_head_t wait_queue;
|
||||
|
||||
struct sys_device dev;
|
||||
struct device dev;
|
||||
void *priv_data;
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user