projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for_paulus
[linux-drm-fsl-dcu.git]
/
drivers
/
macintosh
/
smu.c
diff --git
a/drivers/macintosh/smu.c
b/drivers/macintosh/smu.c
index 090e40fc501335115e51c5c3138354b0dbccedd7..3096836d8bd3309e35b459d2684b6688838ff58e 100644
(file)
--- a/
drivers/macintosh/smu.c
+++ b/
drivers/macintosh/smu.c
@@
-46,6
+46,7
@@
#include <asm/abs_addr.h>
#include <asm/uaccess.h>
#include <asm/of_device.h>
#include <asm/abs_addr.h>
#include <asm/uaccess.h>
#include <asm/of_device.h>
+#include <asm/of_platform.h>
#define VERSION "0.7"
#define AUTHOR "(c) 2005 Benjamin Herrenschmidt, IBM Corp."
#define VERSION "0.7"
#define AUTHOR "(c) 2005 Benjamin Herrenschmidt, IBM Corp."
@@
-145,7
+146,7
@@
static void smu_start_cmd(void)
}
}
-static irqreturn_t smu_db_intr(int irq, void *arg
, struct pt_regs *regs
)
+static irqreturn_t smu_db_intr(int irq, void *arg)
{
unsigned long flags;
struct smu_cmd *cmd;
{
unsigned long flags;
struct smu_cmd *cmd;
@@
-224,7
+225,7
@@
static irqreturn_t smu_db_intr(int irq, void *arg, struct pt_regs *regs)
}
}
-static irqreturn_t smu_msg_intr(int irq, void *arg
, struct pt_regs *regs
)
+static irqreturn_t smu_msg_intr(int irq, void *arg)
{
/* I don't quite know what to do with this one, we seem to never
* receive it, so I suspect we have to arm it someway in the SMU
{
/* I don't quite know what to do with this one, we seem to never
* receive it, so I suspect we have to arm it someway in the SMU
@@
-309,7
+310,7
@@
void smu_poll(void)
gpio = pmac_do_feature_call(PMAC_FTR_READ_GPIO, NULL, smu->doorbell);
if ((gpio & 7) == 7)
gpio = pmac_do_feature_call(PMAC_FTR_READ_GPIO, NULL, smu->doorbell);
if ((gpio & 7) == 7)
- smu_db_intr(smu->db_irq, smu
, NULL
);
+ smu_db_intr(smu->db_irq, smu);
}
EXPORT_SYMBOL(smu_poll);
}
EXPORT_SYMBOL(smu_poll);
@@
-600,7
+601,7
@@
core_initcall(smu_late_init);
* sysfs visibility
*/
* sysfs visibility
*/
-static void smu_expose_childs(
void
*unused)
+static void smu_expose_childs(
struct work_struct
*unused)
{
struct device_node *np;
{
struct device_node *np;
@@
-610,7
+611,7
@@
static void smu_expose_childs(void *unused)
&smu->of_dev->dev);
}
&smu->of_dev->dev);
}
-static DECLARE_WORK(smu_expose_childs_work, smu_expose_childs
, NULL
);
+static DECLARE_WORK(smu_expose_childs_work, smu_expose_childs);
static int smu_platform_probe(struct of_device* dev,
const struct of_device_id *match)
static int smu_platform_probe(struct of_device* dev,
const struct of_device_id *match)
@@
-653,7
+654,7
@@
static int __init smu_init_sysfs(void)
* I'm a bit too far from figuring out how that works with those
* new chipsets, but that will come back and bite us
*/
* I'm a bit too far from figuring out how that works with those
* new chipsets, but that will come back and bite us
*/
- of_register_driver(&smu_of_platform_driver);
+ of_register_
platform_
driver(&smu_of_platform_driver);
return 0;
}
return 0;
}
@@
-870,7
+871,7
@@
int smu_queue_i2c(struct smu_i2c_cmd *cmd)
static int smu_read_datablock(u8 *dest, unsigned int addr, unsigned int len)
{
static int smu_read_datablock(u8 *dest, unsigned int addr, unsigned int len)
{
- DECLARE_COMPLETION(comp);
+ DECLARE_COMPLETION
_ONSTACK
(comp);
unsigned int chunk;
struct smu_cmd cmd;
int rc;
unsigned int chunk;
struct smu_cmd cmd;
int rc;
@@
-917,7
+918,7
@@
static int smu_read_datablock(u8 *dest, unsigned int addr, unsigned int len)
static struct smu_sdbp_header *smu_create_sdb_partition(int id)
{
static struct smu_sdbp_header *smu_create_sdb_partition(int id)
{
- DECLARE_COMPLETION(comp);
+ DECLARE_COMPLETION
_ONSTACK
(comp);
struct smu_simple_cmd cmd;
unsigned int addr, len, tlen;
struct smu_sdbp_header *hdr;
struct smu_simple_cmd cmd;
unsigned int addr, len, tlen;
struct smu_sdbp_header *hdr;
@@
-944,7
+945,7
@@
static struct smu_sdbp_header *smu_create_sdb_partition(int id)
*/
tlen = sizeof(struct property) + len + 18;
*/
tlen = sizeof(struct property) + len + 18;
- prop = k
calloc(tlen, 1
, GFP_KERNEL);
+ prop = k
zalloc(tlen
, GFP_KERNEL);
if (prop == NULL)
return NULL;
hdr = (struct smu_sdbp_header *)(prop + 1);
if (prop == NULL)
return NULL;
hdr = (struct smu_sdbp_header *)(prop + 1);
@@
-1276,7
+1277,7
@@
static int smu_release(struct inode *inode, struct file *file)
}
}
-static struct file_operations smu_device_fops = {
+static
const
struct file_operations smu_device_fops = {
.llseek = no_llseek,
.read = smu_read,
.write = smu_write,
.llseek = no_llseek,
.read = smu_read,
.write = smu_write,