Changeset 67

Timestamp:

12/11/98 03:16:59 (14 years ago)

Author:

frodo

Message:

Made the ISA/SMBus code shut up if DEBUG is off and things try to
access unimplementable functionality. And removed a #if which could never
become true anyway from i2c-proc.c.

Location:

lm-sensors/trunk

Files:

• kernel/busses/i2c-isa.c (modified) (3 diffs)
• kernel/i2c-proc.c (modified) (1 diff)
• kernel/smbus.c (modified) (3 diffs)
• src/i2c-proc.c (modified) (1 diff)
• src/isa.c (modified) (3 diffs)
• src/smbus.c (modified) (3 diffs)

lm-sensors/trunk/kernel/busses/i2c-isa.c

@@ -76 +76 @@
                      int num)
 {
+#ifdef DEBUG
   printk("isa.o: isa_master_xfer called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 
@@ -85 +87 @@
 int isa_slave_send (struct isa_adapter *adap, char *data, int len)
 {
+#ifdef DEBUG
   printk("isa.o: isa_slave_send called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 
@@ -94 +98 @@
 int isa_slave_recv (struct isa_adapter *adap, char *data, int len)
 {
+#ifdef DEBUG
   printk("isa.o: isa_slave_recv called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 

lm-sensors/trunk/kernel/i2c-proc.c

@@ -85 +85 @@
     /* ops */           NULL,
     /* get_info */      &read_bus_i2c
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
-    /* fill_inode */    &monitor_bus_i2c
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
   };
 

lm-sensors/trunk/kernel/smbus.c

@@ -188 +188 @@
                        int num)
 {
+#ifdef DEBUG
   printk("smbus.o: smbus_master_xfer called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 
@@ -197 +199 @@
 int smbus_slave_send (struct smbus_adapter *adap, char *data, int len)
 {
+#ifdef DEBUG
   printk("smbus.o: smbus_slave_send called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 
@@ -206 +210 @@
 int smbus_slave_recv (struct smbus_adapter *adap, char *data, int len)
 {
+#ifdef DEBUG
   printk("smbus.o: smbus_slave_recv called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 

lm-sensors/trunk/src/i2c-proc.c

@@ -85 +85 @@
     /* ops */           NULL,
     /* get_info */      &read_bus_i2c
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
-    /* fill_inode */    &monitor_bus_i2c
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
   };
 

lm-sensors/trunk/src/isa.c

@@ -76 +76 @@
                      int num)
 {
+#ifdef DEBUG
   printk("isa.o: isa_master_xfer called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 
@@ -85 +87 @@
 int isa_slave_send (struct isa_adapter *adap, char *data, int len)
 {
+#ifdef DEBUG
   printk("isa.o: isa_slave_send called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 
@@ -94 +98 @@
 int isa_slave_recv (struct isa_adapter *adap, char *data, int len)
 {
+#ifdef DEBUG
   printk("isa.o: isa_slave_recv called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 

lm-sensors/trunk/src/smbus.c

@@ -188 +188 @@
                        int num)
 {
+#ifdef DEBUG
   printk("smbus.o: smbus_master_xfer called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 
@@ -197 +199 @@
 int smbus_slave_send (struct smbus_adapter *adap, char *data, int len)
 {
+#ifdef DEBUG
   printk("smbus.o: smbus_slave_send called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }
 
@@ -206 +210 @@
 int smbus_slave_recv (struct smbus_adapter *adap, char *data, int len)
 {
+#ifdef DEBUG
   printk("smbus.o: smbus_slave_recv called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
   return -1;
+#endif
 }