projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
rtmutex-tester.c
diff --git
a/kernel/rtmutex-tester.c
b/kernel/rtmutex-tester.c
index 3d9f31cd79e70dc1510c15fb47b9b5741862a1d8..98ec494754608a18b93625bf54f53fb2e0617bf0 100644
(file)
--- a/
kernel/rtmutex-tester.c
+++ b/
kernel/rtmutex-tester.c
@@
-6,11
+6,11
@@
* Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx@timesys.com>
*
*/
* Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx@timesys.com>
*
*/
+#include <linux/device.h>
#include <linux/kthread.h>
#include <linux/export.h>
#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/kthread.h>
#include <linux/export.h>
#include <linux/sched.h>
#include <linux/spinlock.h>
-#include <linux/sysdev.h>
#include <linux/timer.h>
#include <linux/freezer.h>
#include <linux/timer.h>
#include <linux/freezer.h>
@@
-27,7
+27,7
@@
struct test_thread_data {
int opdata;
int mutexes[MAX_RT_TEST_MUTEXES];
int event;
int opdata;
int mutexes[MAX_RT_TEST_MUTEXES];
int event;
- struct
sys_device sys
dev;
+ struct
device
dev;
};
static struct test_thread_data thread_data[MAX_RT_TEST_THREADS];
};
static struct test_thread_data thread_data[MAX_RT_TEST_THREADS];
@@
-271,7
+271,7
@@
static int test_func(void *data)
*
* opcode:data
*/
*
* opcode:data
*/
-static ssize_t sysfs_test_command(struct
sys_device *dev, struct sysdev
_attribute *attr,
+static ssize_t sysfs_test_command(struct
device *dev, struct device
_attribute *attr,
const char *buf, size_t count)
{
struct sched_param schedpar;
const char *buf, size_t count)
{
struct sched_param schedpar;
@@
-279,8
+279,8
@@
static ssize_t sysfs_test_command(struct sys_device *dev, struct sysdev_attribut
char cmdbuf[32];
int op, dat, tid, ret;
char cmdbuf[32];
int op, dat, tid, ret;
- td = container_of(dev, struct test_thread_data,
sys
dev);
- tid = td->
sys
dev.id;
+ td = container_of(dev, struct test_thread_data, dev);
+ tid = td->dev.id;
/* strings from sysfs write are not 0 terminated! */
if (count >= sizeof(cmdbuf))
/* strings from sysfs write are not 0 terminated! */
if (count >= sizeof(cmdbuf))
@@
-334,7
+334,7
@@
static ssize_t sysfs_test_command(struct sys_device *dev, struct sysdev_attribut
* @dev: thread to query
* @buf: char buffer to be filled with thread status info
*/
* @dev: thread to query
* @buf: char buffer to be filled with thread status info
*/
-static ssize_t sysfs_test_status(struct
sys_device *dev, struct sysdev
_attribute *attr,
+static ssize_t sysfs_test_status(struct
device *dev, struct device
_attribute *attr,
char *buf)
{
struct test_thread_data *td;
char *buf)
{
struct test_thread_data *td;
@@
-342,8
+342,8
@@
static ssize_t sysfs_test_status(struct sys_device *dev, struct sysdev_attribute
char *curr = buf;
int i;
char *curr = buf;
int i;
- td = container_of(dev, struct test_thread_data,
sys
dev);
- tsk = threads[td->
sys
dev.id];
+ td = container_of(dev, struct test_thread_data, dev);
+ tsk = threads[td->dev.id];
spin_lock(&rttest_lock);
spin_lock(&rttest_lock);
@@
-360,28
+360,29
@@
static ssize_t sysfs_test_status(struct sys_device *dev, struct sysdev_attribute
spin_unlock(&rttest_lock);
curr += sprintf(curr, ", T: %p, R: %p\n", tsk,
spin_unlock(&rttest_lock);
curr += sprintf(curr, ", T: %p, R: %p\n", tsk,
- mutexes[td->
sys
dev.id].owner);
+ mutexes[td->dev.id].owner);
return curr - buf;
}
return curr - buf;
}
-static
SYSDEV
_ATTR(status, 0600, sysfs_test_status, NULL);
-static
SYSDEV
_ATTR(command, 0600, NULL, sysfs_test_command);
+static
DEVICE
_ATTR(status, 0600, sysfs_test_status, NULL);
+static
DEVICE
_ATTR(command, 0600, NULL, sysfs_test_command);
-static struct
sysdev_class rttest_sysclas
s = {
+static struct
bus_type rttest_subsy
s = {
.name = "rttest",
.name = "rttest",
+ .dev_name = "rttest",
};
static int init_test_thread(int id)
{
};
static int init_test_thread(int id)
{
- thread_data[id].
sysdev.cls = &rttest_sysclas
s;
- thread_data[id].
sys
dev.id = id;
+ thread_data[id].
dev.bus = &rttest_subsy
s;
+ thread_data[id].dev.id = id;
threads[id] = kthread_run(test_func, &thread_data[id], "rt-test-%d", id);
if (IS_ERR(threads[id]))
return PTR_ERR(threads[id]);
threads[id] = kthread_run(test_func, &thread_data[id], "rt-test-%d", id);
if (IS_ERR(threads[id]))
return PTR_ERR(threads[id]);
- return
sysdev_register(&thread_data[id].sys
dev);
+ return
device_register(&thread_data[id].
dev);
}
static int init_rttest(void)
}
static int init_rttest(void)
@@
-393,7
+394,7
@@
static int init_rttest(void)
for (i = 0; i < MAX_RT_TEST_MUTEXES; i++)
rt_mutex_init(&mutexes[i]);
for (i = 0; i < MAX_RT_TEST_MUTEXES; i++)
rt_mutex_init(&mutexes[i]);
- ret = s
ysdev_class_register(&rttest_sysclass
);
+ ret = s
ubsys_system_register(&rttest_subsys, NULL
);
if (ret)
return ret;
if (ret)
return ret;
@@
-401,10
+402,10
@@
static int init_rttest(void)
ret = init_test_thread(i);
if (ret)
break;
ret = init_test_thread(i);
if (ret)
break;
- ret =
sysdev_create_file(&thread_data[i].sysdev, &
attr_status);
+ ret =
device_create_file(&thread_data[i].dev, &dev_
attr_status);
if (ret)
break;
if (ret)
break;
- ret =
sysdev_create_file(&thread_data[i].sysdev, &
attr_command);
+ ret =
device_create_file(&thread_data[i].dev, &dev_
attr_command);
if (ret)
break;
}
if (ret)
break;
}