projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull platform-drivers into test branch
[powerpc.git]
/
drivers
/
acpi
/
ibm_acpi.c
diff --git
a/drivers/acpi/ibm_acpi.c
b/drivers/acpi/ibm_acpi.c
index
1397efb
..
130cc8c
100644
(file)
--- a/
drivers/acpi/ibm_acpi.c
+++ b/
drivers/acpi/ibm_acpi.c
@@
-1714,7
+1714,7
@@
static struct backlight_properties ibm_backlight_data = {
static int brightness_init(void)
{
static int brightness_init(void)
{
- ibm_backlight_device = backlight_device_register("ibm", NULL,
+ ibm_backlight_device = backlight_device_register("ibm", NULL,
NULL,
&ibm_backlight_data);
if (IS_ERR(ibm_backlight_device)) {
printk(IBM_ERR "Could not register backlight device\n");
&ibm_backlight_data);
if (IS_ERR(ibm_backlight_device)) {
printk(IBM_ERR "Could not register backlight device\n");
@@
-1825,9
+1825,9
@@
static enum fan_control_commands fan_control_commands;
static int fan_control_status_known;
static u8 fan_control_initial_status;
static int fan_control_status_known;
static u8 fan_control_initial_status;
-static void fan_watchdog_fire(
void
*ignored);
+static void fan_watchdog_fire(
struct work_struct
*ignored);
static int fan_watchdog_maxinterval;
static int fan_watchdog_maxinterval;
-static DECLARE_
WORK(fan_watchdog_task, fan_watchdog_fire, NULL
);
+static DECLARE_
DELAYED_WORK(fan_watchdog_task, fan_watchdog_fire
);
static int fan_init(void)
{
static int fan_init(void)
{
@@
-2284,7
+2284,7
@@
static int fan_write(char *buf)
return rc;
}
return rc;
}
-static void fan_watchdog_fire(
void
*ignored)
+static void fan_watchdog_fire(
struct work_struct
*ignored)
{
printk(IBM_NOTICE "fan watchdog: enabling fan\n");
if (fan_set_enable()) {
{
printk(IBM_NOTICE "fan watchdog: enabling fan\n");
if (fan_set_enable()) {
@@
-2417,7
+2417,7
@@
static struct ibm_struct ibms[] = {
static int dispatch_read(char *page, char **start, off_t off, int count,
int *eof, void *data)
{
static int dispatch_read(char *page, char **start, off_t off, int count,
int *eof, void *data)
{
- struct ibm_struct *ibm =
(struct ibm_struct *)
data;
+ struct ibm_struct *ibm = data;
int len;
if (!ibm || !ibm->read)
int len;
if (!ibm || !ibm->read)
@@
-2442,7
+2442,7
@@
static int dispatch_read(char *page, char **start, off_t off, int count,
static int dispatch_write(struct file *file, const char __user * userbuf,
unsigned long count, void *data)
{
static int dispatch_write(struct file *file, const char __user * userbuf,
unsigned long count, void *data)
{
- struct ibm_struct *ibm =
(struct ibm_struct *)
data;
+ struct ibm_struct *ibm = data;
char *kernbuf;
int ret;
char *kernbuf;
int ret;
@@
-2471,7
+2471,7
@@
static int dispatch_write(struct file *file, const char __user * userbuf,
static void dispatch_notify(acpi_handle handle, u32 event, void *data)
{
static void dispatch_notify(acpi_handle handle, u32 event, void *data)
{
- struct ibm_struct *ibm =
(struct ibm_struct *)
data;
+ struct ibm_struct *ibm = data;
if (!ibm || !ibm->notify)
return;
if (!ibm || !ibm->notify)
return;