isdn: whitespace coding style cleanup
isdn source code uses a not-current coding style.
Update the coding style used on a per-line basis
so that git diff -w shows only elided blank lines
at EOF.
Done with emacs and some scripts and some typing.
Built x86 allyesconfig.
No detected change in objdump -d or size.
Signed-off-by: Joe Perches <joe@perches.com>
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index 42d3b834..a5c8f90 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -1,7 +1,7 @@
/* $Id: divasi.c,v 1.25.6.2 2005/01/31 12:22:20 armin Exp $
*
* Driver for Eicon DIVA Server ISDN cards.
- * User Mode IDI Interface
+ * User Mode IDI Interface
*
* Copyright 2000-2003 by Armin Schindler (mac@melware.de)
* Copyright 2000-2003 Cytronics & Melware (info@melware.de)
@@ -71,10 +71,10 @@
* LOCALS
*/
static ssize_t um_idi_read(struct file *file, char __user *buf, size_t count,
- loff_t * offset);
+ loff_t *offset);
static ssize_t um_idi_write(struct file *file, const char __user *buf,
- size_t count, loff_t * offset);
-static unsigned int um_idi_poll(struct file *file, poll_table * wait);
+ size_t count, loff_t *offset);
+static unsigned int um_idi_poll(struct file *file, poll_table *wait);
static int um_idi_open(struct inode *inode, struct file *file);
static int um_idi_release(struct inode *inode, struct file *file);
static int remove_entity(void *entity);
@@ -194,7 +194,7 @@
}
printk(KERN_INFO "%s: started with major %d\n", DRIVERLNAME, major);
- out:
+out:
return (ret);
}
@@ -228,7 +228,7 @@
}
static ssize_t
-um_idi_read(struct file *file, char __user *buf, size_t count, loff_t * offset)
+um_idi_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
{
diva_um_idi_os_context_t *p_os;
int ret = -EINVAL;
@@ -292,7 +292,7 @@
{
diva_um_idi_os_context_t *p_os;
void *e =
- divas_um_idi_create_entity((dword) adapter_nr, (void *) file);
+ divas_um_idi_create_entity((dword) adapter_nr, (void *) file);
if (!(file->private_data = e)) {
return (0);
@@ -310,7 +310,7 @@
static ssize_t
um_idi_write(struct file *file, const char __user *buf, size_t count,
- loff_t * offset)
+ loff_t *offset)
{
diva_um_idi_os_context_t *p_os;
int ret = -EINVAL;
@@ -331,8 +331,8 @@
}
if (!(p_os =
- (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file->
- private_data)))
+ (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file->
+ private_data)))
{
return (-ENODEV);
}
@@ -367,7 +367,7 @@
return (ret);
}
-static unsigned int um_idi_poll(struct file *file, poll_table * wait)
+static unsigned int um_idi_poll(struct file *file, poll_table *wait)
{
diva_um_idi_os_context_t *p_os;
@@ -417,7 +417,7 @@
}
if (!(p_os =
- (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file->private_data))) {
+ (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file->private_data))) {
ret = -ENODEV;
goto out;
}
@@ -434,7 +434,7 @@
goto out;
}
- out:
+out:
return (ret);
}
@@ -446,14 +446,14 @@
void diva_os_wakeup_read(void *os_context)
{
diva_um_idi_os_context_t *p_os =
- (diva_um_idi_os_context_t *) os_context;
+ (diva_um_idi_os_context_t *) os_context;
wake_up_interruptible(&p_os->read_wait);
}
void diva_os_wakeup_close(void *os_context)
{
diva_um_idi_os_context_t *p_os =
- (diva_um_idi_os_context_t *) os_context;
+ (diva_um_idi_os_context_t *) os_context;
wake_up_interruptible(&p_os->close_wait);
}
@@ -466,7 +466,7 @@
wake_up_interruptible(&p_os->read_wait);
wake_up_interruptible(&p_os->close_wait);
DBG_ERR(("entity removal watchdog"))
-}
+ }
/*
** If application exits without entity removal this function will remove
@@ -481,30 +481,30 @@
if (!entity) {
DBG_FTL(("Zero entity on remove"))
- return (0);
+ return (0);
}
if (!(p_os =
- (diva_um_idi_os_context_t *)
- diva_um_id_get_os_context(entity))) {
+ (diva_um_idi_os_context_t *)
+ diva_um_id_get_os_context(entity))) {
DBG_FTL(("Zero entity os context on remove"))
- return (0);
+ return (0);
}
if (!divas_um_idi_entity_assigned(entity) || p_os->aborted) {
/*
- Entity is not assigned, also can be removed
- */
+ Entity is not assigned, also can be removed
+ */
return (0);
}
DBG_TRC(("E(%08x) check remove", entity))
- /*
- If adapter not answers on remove request inside of
- 10 Sec, then adapter is dead
- */
- diva_um_idi_start_wdog(entity);
+ /*
+ If adapter not answers on remove request inside of
+ 10 Sec, then adapter is dead
+ */
+ diva_um_idi_start_wdog(entity);
{
DECLARE_WAITQUEUE(wait, curtask);
@@ -542,7 +542,7 @@
DBG_TRC(("E(%08x) remove complete, aborted:%d", entity,
p_os->aborted))
- diva_um_idi_stop_wdog(entity);
+ diva_um_idi_stop_wdog(entity);
p_os->aborted = 0;