Changeset 3342

Timestamp:

07/22/99 17:34:50 (9 years ago)

Author:

frodo

Message:

All modules report themselves now by their own name. They all print
a single line when inserted. They all use their own name for all their
messages.

To do: use the <linux/kernel.h> defines to classify all printk's by
severity.

Files:

• i2c/trunk/TODO (modified) (1 diff)
• i2c/trunk/kernel/i2c-algo-bit.c (modified) (13 diffs)
• i2c/trunk/kernel/i2c-algo-pcf.c (modified) (17 diffs)
• i2c/trunk/kernel/i2c-core.c (modified) (46 diffs)
• i2c/trunk/kernel/i2c-dev.c (modified) (5 diffs)
• i2c/trunk/kernel/i2c-elektor.c (modified) (5 diffs)
• i2c/trunk/kernel/i2c-elv.c (modified) (4 diffs)
• i2c/trunk/kernel/i2c-philips-par.c (modified) (2 diffs)
• i2c/trunk/kernel/i2c-velleman.c (modified) (3 diffs)

i2c/trunk/TODO

@@ -4 +4 @@
-  variable access, especially during (de)registration activity.
-* Make mkpatch remove old patched lines. Make it more robust.
-
-
-
+
+
+
+
-* Check debugging levels in all modules are sane.
-* Pretty-print everything as in the kernel code guidelines (found in 

i2c/trunk/kernel/i2c-algo-bit.c

@@ -271 +271 @@
-        sda=getsda(adap);
-        if (adap->getscl==NULL) {
-(bit)
+-algo-bit.o
-                return 0;               
-        }
-        scl=getscl(adap);
-(bit)
+-algo-bit.o
-        name,getscl(adap),getsda(adap));
-        if (!scl || !sda ) {
-(bit)
+-algo-bit.o
-                goto bailout;
-        }
-        sdalo(adap);
-(bit)
+-algo-bit.o
-        if ( 0 != getsda(adap) ) {
-(bit)
+-algo-bit.o
-                sdahi(adap);
-                goto bailout;
-        }
-        if ( 0 == getscl(adap) ) {
-(bit)
+-algo-bit.o
-                        name);
-                goto bailout;
-        }               
-        sdahi(adap);
-(bit)
+-algo-bit.o
-        if ( 0 == getsda(adap) ) {
-(bit)
+-algo-bit.o
-                sdahi(adap);
-                goto bailout;
-        }
-        if ( 0 == getscl(adap) ) {
-(bit)
+-algo-bit.o
-        goto bailout;
-        }
-        scllo(adap);
-(bit)
+-algo-bit.o
-        if ( 0 != getscl(adap) ) {
-(bit)
+-algo-bit.o
-                sclhi(adap);
-                goto bailout;
-        }
-        if ( 0 == getsda(adap) ) {
-(bit)
+-algo-bit.o
-                        name);
-                goto bailout;
-        }
-        sclhi(adap);
-(bit)
+-algo-bit.o
-        if ( 0 == getscl(adap) ) {
-(bit)
+-algo-bit.o
-                sclhi(adap);
-                goto bailout;
-        }
-        if ( 0 == getsda(adap) ) {
-(bit)
+-algo-bit.o
-                        name);
-                goto bailout;
-        }
-(bit)
+-algo-bit.o
-        return 0;
-bailout:
@@ -353 +353 @@
-                udelay(adap->udelay);
-        }
-(bit)
+-algo-bit.o
-        return ret;
-}
@@ -367 +367 @@
-        while (count > 0) {
-                c = *temp;
-(bit)
+-algo-bit.o
-                            i2c_adap->name, c&0xff));
-                retval = i2c_outb(i2c_adap,c);
@@ -375 +375 @@
-                        wrcount++;
-                } else { /* arbitration or no acknowledge */
-(bit)
+-algo-bit.o
-                               i2c_adap->name);
-                        i2c_stop(adap);
@@ -405 +405 @@
-                        rdcount++;
-                } else {   /* read timed out */
-(bit)
+-algo-bit.o
-                        break;
-                }
@@ -418 +418 @@
-                if (sclhi(adap)<0) {    /* timeout */
-                        sdahi(adap);
-(bit)
+-algo-bit.o
-                        return -ETIMEDOUT;
-                };
@@ -488 +488 @@
-                ret = bit_doAddress(i2c_adap,pmsg,i2c_adap->retries);
-                if (ret != 0) {
-(bit)
+-algo-bit.o
-                               ,msgs[i].addr,i));
-                        return -EREMOTEIO;
@@ -495 +495 @@
-                        /* read bytes into buffer*/
-                        ret = readbytes(i2c_adap,pmsg->buf,pmsg->len);
-(bit)
+-algo-bit.o
-                } else {
-                        /* write bytes from buffer */
-                        ret = sendbytes(i2c_adap,pmsg->buf,pmsg->len);
-(bit)
+-algo-bit.o
-                }
-                if (i<num-1) {
@@ -550 +550 @@
-        bit_adaps[i] = adap;
-        adap_count++;
-(bit)
+-algo-bit.o
-
-        /* register new adapter to i2c module... */
@@ -563 +563 @@
-        if (bit_scan) {
-                int ack;
-(bit)
+-algo-bit.o
-                for (i = 0x00; i < 0xff; i+=2) {
-                        i2c_start(bit_adap);
@@ -593 +593 @@
-                        break;
-        if ( I2C_BIT_ADAP_MAX == i) {
-(bit)
+-algo-bit.o
-                        adap->name);
-                return -ENODEV;
@@ -602 +602 @@
-
-        adap_count--;
-(bit)
+-algo-bit.o
-
-#ifdef MODULE
@@ -614 +614 @@
-        int i;
-
+        printk("i2c-algo-bit.o: i2c bit algorithm module\n");
-        for (i=0;i<I2C_BIT_ADAP_MAX;i++) {
-                bit_adaps[i]=NULL;

i2c/trunk/kernel/i2c-algo-pcf.c

@@ -202 +202 @@
-        set_pcf(adap, 1, I2C_PCF_IDLE);
-
-algo-pcf-
+i2c-algo-pcf.o: 
-        return 0;
-}
@@ -216 +216 @@
-        sda=getsda(adap);
-        if (adap->getscl==NULL) {
-(pcf)
+-algo-pcf.o
-                return 0;               
-        }
-        scl=getscl(adap);
-(pcf)
+-algo-pcf.o
-        name,getscl(adap),getsda(adap));
-        if (!scl || !sda ) {
-(pcf)
+-algo-pcf.o
-                goto bailout;
-        }
-        sdalo(adap);
-(pcf)
+-algo-pcf.o
-        if ( 0 != getsda(adap) ) {
-(pcf)
+-algo-pcf.o
-                sdahi(adap);
-                goto bailout;
-        }
-        if ( 0 == getscl(adap) ) {
-(pcf)
+-algo-pcf.o
-                        name);
-                goto bailout;
-        }               
-        sdahi(adap);
-(pcf)
+-algo-pcf.o
-        if ( 0 == getsda(adap) ) {
-(pcf)
+-algo-pcf.o
-                sdahi(adap);
-                goto bailout;
-        }
-        if ( 0 == getscl(adap) ) {
-(pcf)
+-algo-pcf.o
-        goto bailout;
-        }
-        scllo(adap);
-(pcf)
+-algo-pcf.o
-        if ( 0 != getscl(adap) ) {
-(pcf)
+-algo-pcf.o
-                sclhi(adap);
-                goto bailout;
-        }
-        if ( 0 == getsda(adap) ) {
-(pcf)
+-algo-pcf.o
-                        name);
-                goto bailout;
-        }
-        sclhi(adap);
-(pcf)
+-algo-pcf.o
-        if ( 0 == getscl(adap) ) {
-(pcf)
+-algo-pcf.o
-                sclhi(adap);
-                goto bailout;
-        }
-        if ( 0 == getsda(adap) ) {
-(pcf)
+-algo-pcf.o
-                        name);
-                goto bailout;
-        }
-(pcf)
+-algo-pcf.o
-        return 0;
-bailout:
@@ -303 +303 @@
-      udelay(adap->udelay);
-   }
-(pcf)
+-algo-pcf.o
-   return ret;
-}
@@ -314 +314 @@
-
-   for (wrcount=0; wrcount<count; ++wrcount) {
-(pcf)
+-algo-pcf.o
-                  i2c_adap->name, buf[wrcount]&0xff));
-      i2c_outb(adap, buf[wrcount]);
-      timeout = wait_for_pin(adap, &status);
-      if (timeout) {
-(pcf)
+-algo-pcf.o
-                i2c_adap->name);
-         i2c_stop(adap);
@@ -325 +325 @@
-      }
-      if (status & I2C_PCF_LRB) {
-(pcf)
+-algo-pcf.o
-                i2c_adap->name);
-         i2c_stop(adap);
@@ -349 +349 @@
-      timeout = wait_for_pin(adap, &status);
-      if (timeout) {
-(pcf)
+-algo-pcf.o
-         return (-1);
-      }
-      if (status & I2C_PCF_LRB) {
-(pcf)
+-algo-pcf.o
-         return (-1);
-      }
@@ -366 +366 @@
-   timeout = wait_for_pin(adap, &status);
-   if (timeout) {
-(pcf)
+-algo-pcf.o
-      return (-1);
-   }
@@ -425 +425 @@
-   timeout = wait_for_bb(adap);
-   if (timeout) {
-
+i2c-algo-pcf.o: 
-      return -EIO;
-   }
@@ -433 +433 @@
-
-   for (i=0; i<num; i++) {
-
+i2c-algo-pcf.o: 
-                  i, msgs[i].addr, msgs[i].flags, msgs[i].len);)
-      timeout = wait_for_pin(adap, &status);
-      if (timeout) {
-
+i2c-algo-pcf.o: 
-         i2c_stop(adap);
-         return (-EREMOTEIO);
@@ -443 +443 @@
-      if (status & I2C_PCF_LRB) {
-         i2c_stop(adap);
-(pcf)
+-algo-pcf.o
-                               ,msgs[i].addr,i));
-         return -EREMOTEIO;
@@ -450 +450 @@
-         /* read bytes into buffer*/
-         ret = pcf_readbytes(i2c_adap, pmsg->buf, pmsg->len);
-(pcf)
+-algo-pcf.o
-      } else {
-         /* write bytes from buffer */
-         ret = pcf_sendbytes(i2c_adap, pmsg->buf, pmsg->len);
-(pcf)
+-algo-pcf.o
-      }
-      if (i == (num-1)) {
@@ -470 +470 @@
-         timeout = wait_for_pin(adap, &status);
-         if (timeout) {
-
+i2c-algo-pcf.o: 
-            return (-EREMOTEIO);
-         }
-         if (status & I2C_PCF_LRB) {
-            i2c_stop(adap);
-
+i2c-algo-pcf.o: 
-            return (-EREMOTEIO);
-         }
@@ -524 +524 @@
-        i2c_pcf_adaps[i] = adap;
-        adap_count++;
-(pcf)
+-algo-pcf.o
-
-        /* register new adapter to i2c module... */
@@ -543 +543 @@
-        /* scan bus */
-        if (pcf_scan) {
-(pcf)
+-algo-pcf.o
-           for (i = 0x00; i < 0xff; i+=2) {
-              i2c_outb(pcf_adap, i);
@@ -570 +570 @@
-                        break;
-        if ( I2C_PCF_ADAP_MAX == i) {
-(pcf)
+-algo-pcf.o
-                        adap->name);
-                return -ENODEV;
@@ -578 +578 @@
-        i2c_del_adapter(adap);
-        adap_count--;
-(pcf)
+-algo-pcf.o
-
-#ifdef MODULE
@@ -590 +590 @@
-        int i;
-
+        printk("i2c-algo-pcf.o: i2c pcf8584 algorithm module\n");
-        for (i=0;i<I2C_PCF_ADAP_MAX;i++) {
-                i2c_pcf_adaps[i]=NULL;

i2c/trunk/kernel/i2c-core.c

@@ -184 +184 @@
-        if (I2C_ALGO_MAX == i) {
-                printk(KERN_WARNING 
-
+-core.o
-                        algo->name);
-                return -ENOMEM;
@@ -192 +192 @@
-        algo_count++;
-
-c
+-core.o
-        return 0;       
-}
@@ -206 +206 @@
-        if (I2C_ALGO_MAX == i) {
-                printk(KERN_WARNING 
-
+-core.o
-                        algo->name);
-                return -ENODEV;
@@ -213 +213 @@
-        algo_count--;
-
-
+-core.o
-        return 0;    
-}
@@ -232 +232 @@
-        if (I2C_ADAP_MAX == i) {
-                printk(KERN_WARNING 
-
+-core.o
-                        adap->name);
-                return -ENOMEM;
@@ -255 +255 @@
-                proc_entry = create_proc_entry(name,0,proc_bus);
-                if (! proc_entry) {
-
+.o
-                               name);
-                        return -ENOENT;
@@ -267 +267 @@
-                if (!(proc_entry = kmalloc(sizeof(struct proc_dir_entry)+
-                                           strlen(name)+1, GFP_KERNEL))) {
-
+.o
-                        return -ENOMEM;
-                }
@@ -285 +285 @@
-        
-                if ((res = proc_register_dynamic(&proc_bus_dir, proc_entry))) {
-
+.o
-                        kfree(proc_entry);
-                        return res;
@@ -303 +303 @@
-                        drivers[j]->attach_adapter(adap);
-
-
+-core.o
-
-        return 0;       
@@ -316 +316 @@
-                        break;
-        if (I2C_ADAP_MAX == i) {
-
+-core.o
-                        adap->name);
-                return -ENODEV;
@@ -331 +331 @@
-                        if ((res = proc_unregister(&proc_bus_dir,
-                                          adapters[i]->proc_entry->low_ino))) {
-
+.o
-                                       "entry failed\n"
-                                return res;
@@ -357 +357 @@
-        adap_count--;
-
-
+-core.o
-        return 0;    
-}
@@ -376 +376 @@
-        if (I2C_DRIVER_MAX == i) {
-                printk(KERN_WARNING 
-
+-core.o
-                        driver->name);
-                return -ENOMEM;
@@ -384 +384 @@
-        driver_count++;
-
-
+-core.o
-
-        /* now look for instances of driver on our adapters
@@ -404 +404 @@
-                        break;
-        if (I2C_DRIVER_MAX == i) {
-
+-core.o
-                        driver->name);
-                return -ENODEV;
@@ -412 +412 @@
-         * afterwards.
-         */
-
+-core.o
-        /* removing clients does not depend on the notify flag, else 
-         * invalid operation might (will!) result, when using stale client
@@ -421 +421 @@
-                if (adap == NULL) /* skip empty entries. */
-                        continue;
-
+-core.o
-                for (j=0;j<I2C_CLIENT_MAX;j++) { 
-                        struct i2c_client *client = adap->clients[j];
-                        if (client != NULL && client->driver == driver) {
-
+-core.o
-                                        client->name));
-                                /*i2c_detach_client(client);*/
@@ -435 +435 @@
-        driver_count--;
-
-
+-core.o
-        return 0;
-}
@@ -450 +450 @@
-        if (I2C_CLIENT_MAX == i) {
-                printk(KERN_WARNING 
-
+-core.o
-                        client->name);
-                return -ENOMEM;
@@ -459 +459 @@
-        if (adapter->client_register != NULL) 
-                adapter->client_register(client);
-
+-core.o
-                client->name, adapter->name,i));
-        return 0;
@@ -474 +474 @@
-                        break;
-        if (I2C_CLIENT_MAX == i) {
-
+-core.o
-                        client->name);
-                return -ENODEV;
@@ -484 +484 @@
-        adapter->clients[i] = NULL;
-        adapter->client_count--;
-
+-core.o
-        return 0;    
-}
@@ -613 +613 @@
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,29))
-        if (! proc_bus) {
-
+.o
-                i2cproc_cleanup();
-                return -ENOENT;
@@ -619 +619 @@
-        proc_bus_i2c = create_proc_entry("i2c",0,proc_bus);
-        if (!proc_bus_i2c) {
-
+.o
-                i2cproc_cleanup();
-                return -ENOENT;
@@ -635 +635 @@
-        proc_bus_dir.ops = proc_net.ops;
-        if ((res = proc_register_dynamic(&proc_root, &proc_bus_dir))) {
-
+.o
-                i2cproc_cleanup();
-                return res;
@@ -641 +641 @@
-        i2cproc_initialized ++;
-        if ((res = proc_register_dynamic(&proc_bus_dir, &proc_bus_i2c_dir))) {
-
+.o
-                i2cproc_cleanup();
-                return res;
@@ -661 +661 @@
-                        if ((res = proc_unregister(&proc_bus_dir,
-                                                  proc_bus_i2c_dir.low_ino))) {
-
+.o
-                                       "/proc/bus/i2c, module not removed.");
-                                return res;
@@ -668 +668 @@
-                }
-                if ((res = proc_unregister(&proc_root,proc_bus_dir.low_ino))) {
-
+.o
-                               "module not removed.");
-                        return res;
@@ -691 +691 @@
-
-        if (adap->algo->master_xfer) {
-
+i2c-core.o: 
-
-                I2C_LOCK(adap);
@@ -699 +699 @@
-                return ret;
-        } else {
-
+i2c-core.o: 
-                       adap->id);
-                return 0;
@@ -717 +717 @@
-                (const char *)msg.buf = buf;
-        
-
+i2c-core.o: 
-                        count,client->adapter->name));
-        
@@ -729 +729 @@
-                return (ret == 1 )? count : ret;
-        } else {
-
+i2c-core.o: 
-                       client->adapter->id);
-                return 0;
@@ -756 +756 @@
-                memcpy(&c[1], buf, sizeof(char)*count);
-                
-
+i2c-core.o: 
-                        count,client->adapter->name,subadress));
-        
@@ -771 +771 @@
-                return (ret == 1 )? count : ret;
-        } else {
-
+i2c-core.o: 
-                       client->adapter->id);
-                return 0;
@@ -796 +796 @@
-                (const char*)msg[1].buf = (const char*)buf;
-                
-
+i2c-core.o: 
-                        count,subadress,client->adapter->name));
-        
@@ -808 +808 @@
-                return (ret == 1 ) ? 0 : ret;
-        } else {
-
+i2c-core.o: 
-                       client->adapter->id);
-                return 0;
@@ -828 +828 @@
-                msg.buf = buf;
-
-
+i2c-core.o: 
-                        count,client->adapter->name));
-        
@@ -835 +835 @@
-                I2C_UNLOCK(adap);
-        
-
+i2c-core.o: 
-                        ret, count, client->addr));
-        
@@ -843 +843 @@
-                return (ret == 1 )? count : ret;
-        } else {
-
+i2c-core.o: 
-                       client->adapter->id);
-                return 0;
@@ -856 +856 @@
-        struct i2c_adapter *adap = client->adapter;
-
-
+-core.o: i2c
-        switch ( cmd ) {
-                case I2C_RETRIES:
@@ -893 +893 @@
-                return (i <= hi_addr) ? (client->addr=i) : -1;
-        } else {
-
+i2c-core.o: 
-                       client->adapter->id);
-                return 0;
@@ -1078 +1078 @@
-        case I2C_SMBUS_BLOCK_DATA:
-                if (read_write == I2C_SMBUS_READ) {
-smbus
+i2c-core
-                               "I2C emulation!\n");
-                return -1;
@@ -1084 +1084 @@
-                        msg[1].len = data->block[0] + 1;
-                        if (msg[1].len > 32) {
-smbus
+i2c-core
-                                       "invalid block write size (%d)\n",
-                                       msg[1].len);
@@ -1094 +1094 @@
-                break;
-        default:
-smbus
+i2c-core
-                       size);
-                return -1;
@@ -1138 +1138 @@
-{
-        /* clear algorithms */
+        printk("i2c-core.o: i2c core module\n");
-        memset(algorithms,0,sizeof(algorithms));
-        memset(adapters,0,sizeof(adapters));
@@ -1147 +1148 @@
-        i2cproc_init();
-        
-        printk(KERN_INFO "i2c module initialized.\n");
-        return 0;
-}

i2c/trunk/kernel/i2c-dev.c

@@ -172 +172 @@
-   struct inode *inode = file->f_dentry->d_inode;
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,70)) */
-_
+-
-         MINOR(inode->i_rdev),(long) offset,origin);
-#endif /* DEBUG */
@@ -206 +206 @@
-
-#ifdef DEBUG
-_
+-
-#endif
-
@@ -243 +243 @@
-
-#ifdef DEBUG
-_
+-
-#endif
-  ret = i2c_master_send(client,tmp,count);
@@ -259 +259 @@
-
-#ifdef DEBUG
-_
+-
-         MINOR(inode->i_rdev),cmd, arg);
-#endif /* DEBUG */
@@ -501 +501 @@
-  int res;
-
+  printk("i2c-dev.o: i2c /dev entries driver module\n");
+
-  i2cdev_initialized = 0;
-  if (register_chrdev(I2C_MAJOR,"i2c",&i2cdev_fops)) {

i2c/trunk/kernel/i2c-elektor.c

@@ -75 +75 @@
-   if (ctl) {
-      if (gpi.pi_irq > 0) {