[PATCH] sparse: more in isdn

annotations and NULL noise removals in drivres/isdn (more BROKEN_ON_SMP
stuff)

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index daa4b55a783cd1a7a77ea8eae952c099568a6e7c..c87516ab20b01864948f66c4a89dc86110b7873e 100644 (file)
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -67,14 +67,14 @@ avmcard *b1_alloc_card(int nr_controllers)
 
        card = kmalloc(sizeof(*card), GFP_KERNEL);
        if (!card)
-               return 0;
+               return NULL;
 
        memset(card, 0, sizeof(*card));
 
         cinfo = kmalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);
        if (!cinfo) {
                kfree(card);
-               return 0;
+               return NULL;
        }
        memset(cinfo, 0, sizeof(*cinfo) * nr_controllers);
 
@@ -753,7 +753,7 @@ avmcard_dma_alloc(char *name, struct pci_dev *pdev, long rsize, long ssize)
  err_kfree:
        kfree(p);
  err:
-       return 0;
+       return NULL;
 }
 
 void avmcard_dma_free(avmcard_dmainfo *p)

diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
index f5fb795650b18484ac0760016e27b2603ee0b1b7..4f639037f1f3489c36b0e46e7a88f99d664a671b 100644 (file)
--- a/drivers/isdn/hysdn/hycapi.c
+++ b/drivers/isdn/hysdn/hycapi.c
@@ -96,7 +96,7 @@ hycapi_remove_ctr(struct capi_ctr *ctrl)
                }
        }
        detach_capi_ctr(ctrl);
-       ctrl->driverdata = 0;
+       ctrl->driverdata = NULL;
        kfree(card->hyctrlinfo);
 
                
@@ -678,7 +678,7 @@ attach the capi-driver to the kernel-capi.
 
 ***********************************************************/
 
-int hycapi_init()
+int hycapi_init(void)
 {
        int i;
        for(i=0;i<CAPI_MAXAPPL;i++) {

diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 2a312dee7743fdbc1e73e370a3e50a5af31aa024..a0983206dcf9aa630a69f2c41277580674436872 100644 (file)
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -89,7 +89,7 @@ process_line(struct conf_writedata *cnf)
 /* write conf file -> boot or send cfg line to card */
 /****************************************************/
 static ssize_t
-hysdn_conf_write(struct file *file, const char *buf, size_t count, loff_t * off)
+hysdn_conf_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
 {
        struct conf_writedata *cnf;
        int i;
@@ -209,7 +209,7 @@ hysdn_conf_write(struct file *file, const char *buf, size_t count, loff_t * off)
 /* read conf file -> output card info data */
 /*******************************************/
 static ssize_t
-hysdn_conf_read(struct file *file, char *buf, size_t count, loff_t * off)
+hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t * off)
 {
        char *cp;
        int i;

diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index 4211cd0424be157bc6ad50877a280b4dbc9c1ee4..648e032868f19152eddf18d88d0401ee17dfdc68 100644 (file)
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -150,7 +150,7 @@ put_log_buffer(hysdn_card * card, char *cp)
 /* write log file -> set log level bits */
 /****************************************/
 static ssize_t
-hysdn_log_write(struct file *file, const char *buf, size_t count, loff_t * off)
+hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
 {
        ulong u = 0;
        int found = 0;
@@ -203,7 +203,7 @@ hysdn_log_write(struct file *file, const char *buf, size_t count, loff_t * off)
 /* read log file */
 /******************/
 static ssize_t
-hysdn_log_read(struct file *file, char *buf, size_t count, loff_t * off)
+hysdn_log_read(struct file *file, char __user *buf, size_t count, loff_t * off)
 {
        struct log_data *inf;
        int len;