git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
char
/
hvcs.c
diff --git
a/drivers/char/hvcs.c
b/drivers/char/hvcs.c
index
207f734
..
69d8866
100644
(file)
--- a/
drivers/char/hvcs.c
+++ b/
drivers/char/hvcs.c
@@
-210,9
+210,9
@@
static struct ktermios hvcs_tty_termios = {
static int hvcs_parm_num_devs = -1;
module_param(hvcs_parm_num_devs, int, 0);
static int hvcs_parm_num_devs = -1;
module_param(hvcs_parm_num_devs, int, 0);
-char hvcs_driver_name[] = "hvcs";
-char hvcs_device_node[] = "hvcs";
-char hvcs_driver_string[]
+
static const
char hvcs_driver_name[] = "hvcs";
+
static const
char hvcs_device_node[] = "hvcs";
+
static const
char hvcs_driver_string[]
= "IBM hvcs (Hypervisor Virtual Console Server) Driver";
/* Status of partner info rescan triggered via sysfs. */
= "IBM hvcs (Hypervisor Virtual Console Server) Driver";
/* Status of partner info rescan triggered via sysfs. */
@@
-784,12
+784,10
@@
static int __devinit hvcs_probe(
return -EFAULT;
}
return -EFAULT;
}
- hvcsd = k
m
alloc(sizeof(*hvcsd), GFP_KERNEL);
+ hvcsd = k
z
alloc(sizeof(*hvcsd), GFP_KERNEL);
if (!hvcsd)
return -ENODEV;
if (!hvcsd)
return -ENODEV;
- /* hvcsd->tty is zeroed out with the memset */
- memset(hvcsd, 0x00, sizeof(*hvcsd));
spin_lock_init(&hvcsd->lock);
/* Automatically incs the refcount the first time */
spin_lock_init(&hvcsd->lock);
/* Automatically incs the refcount the first time */
@@
-1094,7
+1092,7
@@
static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
* NOTICE: Do NOT hold either the hvcs_struct.lock or hvcs_structs_lock when
* calling this function or you will get deadlock.
*/
* NOTICE: Do NOT hold either the hvcs_struct.lock or hvcs_structs_lock when
* calling this function or you will get deadlock.
*/
-struct hvcs_struct *hvcs_get_by_index(int index)
+st
atic st
ruct hvcs_struct *hvcs_get_by_index(int index)
{
struct hvcs_struct *hvcsd = NULL;
unsigned long flags;
{
struct hvcs_struct *hvcsd = NULL;
unsigned long flags;