git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
[sfrench/cifs-2.6.git]
/
drivers
/
char
/
lp.c
diff --git
a/drivers/char/lp.c
b/drivers/char/lp.c
index 62051f8b0910cb97c04fc58e364f0996437c60be..60ac642752bea4441604515513efa160d6e8c73f 100644
(file)
--- a/
drivers/char/lp.c
+++ b/
drivers/char/lp.c
@@
-144,7
+144,7
@@
static unsigned int lp_count = 0;
static struct class *lp_class;
#ifdef CONFIG_LP_CONSOLE
static struct class *lp_class;
#ifdef CONFIG_LP_CONSOLE
-static struct parport *console_registered;
// initially NULL
+static struct parport *console_registered;
#endif /* CONFIG_LP_CONSOLE */
#undef LP_DEBUG
#endif /* CONFIG_LP_CONSOLE */
#undef LP_DEBUG
@@
-312,7
+312,7
@@
static ssize_t lp_write(struct file * file, const char __user * buf,
if (copy_size > LP_BUFFER_SIZE)
copy_size = LP_BUFFER_SIZE;
if (copy_size > LP_BUFFER_SIZE)
copy_size = LP_BUFFER_SIZE;
- if (
down_interruptible
(&lp_table[minor].port_mutex))
+ if (
mutex_lock_interruptible
(&lp_table[minor].port_mutex))
return -EINTR;
if (copy_from_user (kbuf, buf, copy_size)) {
return -EINTR;
if (copy_from_user (kbuf, buf, copy_size)) {
@@
-399,7
+399,7
@@
static ssize_t lp_write(struct file * file, const char __user * buf,
lp_release_parport (&lp_table[minor]);
}
out_unlock:
lp_release_parport (&lp_table[minor]);
}
out_unlock:
-
up
(&lp_table[minor].port_mutex);
+
mutex_unlock
(&lp_table[minor].port_mutex);
return retv;
}
return retv;
}
@@
-421,7
+421,7
@@
static ssize_t lp_read(struct file * file, char __user * buf,
if (count > LP_BUFFER_SIZE)
count = LP_BUFFER_SIZE;
if (count > LP_BUFFER_SIZE)
count = LP_BUFFER_SIZE;
- if (
down_interruptible
(&lp_table[minor].port_mutex))
+ if (
mutex_lock_interruptible
(&lp_table[minor].port_mutex))
return -EINTR;
lp_claim_parport_or_block (&lp_table[minor]);
return -EINTR;
lp_claim_parport_or_block (&lp_table[minor]);
@@
-479,7
+479,7
@@
static ssize_t lp_read(struct file * file, char __user * buf,
if (retval > 0 && copy_to_user (buf, kbuf, retval))
retval = -EFAULT;
if (retval > 0 && copy_to_user (buf, kbuf, retval))
retval = -EFAULT;
-
up
(&lp_table[minor].port_mutex);
+
mutex_unlock
(&lp_table[minor].port_mutex);
return retval;
}
return retval;
}
@@
-749,8
+749,8
@@
static struct console lpcons = {
/* --- initialisation code ------------------------------------- */
static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };
/* --- initialisation code ------------------------------------- */
static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };
-static char *parport[LP_NO]
= { NULL, }
;
-static int reset
= 0
;
+static char *parport[LP_NO];
+static int reset;
module_param_array(parport, charp, NULL, 0);
module_param(reset, bool, 0);
module_param_array(parport, charp, NULL, 0);
module_param(reset, bool, 0);
@@
-758,10
+758,10
@@
module_param(reset, bool, 0);
#ifndef MODULE
static int __init lp_setup (char *str)
{
#ifndef MODULE
static int __init lp_setup (char *str)
{
- static int parport_ptr;
// initially zero
+ static int parport_ptr;
int x;
int x;
- if (get_option
(&str, &x)) {
+ if (get_option(&str, &x)) {
if (x == 0) {
/* disable driver on "lp=" or "lp=0" */
parport_nr[0] = LP_PARPORT_OFF;
if (x == 0) {
/* disable driver on "lp=" or "lp=0" */
parport_nr[0] = LP_PARPORT_OFF;
@@
-799,8
+799,7
@@
static int lp_register(int nr, struct parport *port)
if (reset)
lp_reset(nr);
if (reset)
lp_reset(nr);
- class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), port->dev,
- "lp%d", nr);
+ device_create(lp_class, port->dev, MKDEV(LP_MAJOR, nr), "lp%d", nr);
printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name,
(port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven");
printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name,
(port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven");
@@
-808,7
+807,7
@@
static int lp_register(int nr, struct parport *port)
#ifdef CONFIG_LP_CONSOLE
if (!nr) {
if (port->modes & PARPORT_MODE_SAFEININT) {
#ifdef CONFIG_LP_CONSOLE
if (!nr) {
if (port->modes & PARPORT_MODE_SAFEININT) {
- register_console
(&lpcons);
+ register_console(&lpcons);
console_registered = port;
printk (KERN_INFO "lp%d: console ready\n", CONSOLE_LP);
} else
console_registered = port;
printk (KERN_INFO "lp%d: console ready\n", CONSOLE_LP);
} else
@@
-824,8
+823,7
@@
static void lp_attach (struct parport *port)
{
unsigned int i;
{
unsigned int i;
- switch (parport_nr[0])
- {
+ switch (parport_nr[0]) {
case LP_PARPORT_UNSPEC:
case LP_PARPORT_AUTO:
if (parport_nr[0] == LP_PARPORT_AUTO &&
case LP_PARPORT_UNSPEC:
case LP_PARPORT_AUTO:
if (parport_nr[0] == LP_PARPORT_AUTO &&
@@
-856,7
+854,7
@@
static void lp_detach (struct parport *port)
/* Write this some day. */
#ifdef CONFIG_LP_CONSOLE
if (console_registered == port) {
/* Write this some day. */
#ifdef CONFIG_LP_CONSOLE
if (console_registered == port) {
- unregister_console
(&lpcons);
+ unregister_console(&lpcons);
console_registered = NULL;
}
#endif /* CONFIG_LP_CONSOLE */
console_registered = NULL;
}
#endif /* CONFIG_LP_CONSOLE */
@@
-890,7
+888,7
@@
static int __init lp_init (void)
lp_table[i].last_error = 0;
init_waitqueue_head (&lp_table[i].waitq);
init_waitqueue_head (&lp_table[i].dataq);
lp_table[i].last_error = 0;
init_waitqueue_head (&lp_table[i].waitq);
init_waitqueue_head (&lp_table[i].dataq);
-
init_MUTEX
(&lp_table[i].port_mutex);
+
mutex_init
(&lp_table[i].port_mutex);
lp_table[i].timeout = 10 * HZ;
}
lp_table[i].timeout = 10 * HZ;
}
@@
-971,7
+969,7
@@
static void lp_cleanup_module (void)
if (lp_table[offset].dev == NULL)
continue;
parport_unregister_device(lp_table[offset].dev);
if (lp_table[offset].dev == NULL)
continue;
parport_unregister_device(lp_table[offset].dev);
-
class_
device_destroy(lp_class, MKDEV(LP_MAJOR, offset));
+ device_destroy(lp_class, MKDEV(LP_MAJOR, offset));
}
class_destroy(lp_class);
}
}
class_destroy(lp_class);
}