Changeset 300

Timestamp:

03/10/99 01:10:42 (10 years ago)

Author:

mds

Message:

added 'i2c-' prefix to module names in all printk's to match new module names.

Files:

• lm-sensors/trunk/kernel/busses/i2c-ali15x3.c (modified) (21 diffs)
• lm-sensors/trunk/kernel/busses/i2c-isa.c (modified) (9 diffs)
• lm-sensors/trunk/kernel/busses/i2c-piix4.c (modified) (17 diffs)

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

@@ -184 +184 @@
-  /* First check whether we can access PCI at all */
-  if (pci_present() == 0) {
-
+i2c-
-    error_return=-ENODEV;
-    goto END;
@@ -202 +202 @@
-  if (res) {
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54) */
-
+i2c-
-    error_return=-ENODEV;
-    goto END;
@@ -233 +233 @@
-  ali15x3_acpia &= (0xffff & ~ (ALI15X3_ACPI_IOSIZE - 1));
-  if(ali15x3_acpia == 0) {
-
+i2c-
-    error_return=-ENODEV;
-  }
@@ -242 +242 @@
-  ali15x3_smba &= (0xffff & ~ (ALI15X3_SMB_IOSIZE - 1));
-  if(ali15x3_smba == 0) {
-
+i2c-
-    error_return=-ENODEV;
-  }
@@ -251 +251 @@
-#ifdef MAP_ACPI
-  if (check_region(ali15x3_acpia, ALI15X3_ACPI_IOSIZE)) {
-
-
+i2c-
+i2c-
-    error_return=-ENODEV;
-  }
@@ -258 +258 @@
-
-  if (check_region(ali15x3_smba, ALI15X3_SMB_IOSIZE)) {
-
+i2c-
-    error_return=-ENODEV;
-  }
@@ -286 +286 @@
-    pci_write_config_byte_united(ALI15X3_dev, ALI15X3_bus, ALI15X3_devfn,
-                                     SMBHSTCFG, temp | 1);
-ali15x3.0
+i2c-ali15x3.o
-           "ENABLED!!\n");
-  }
@@ -313 +313 @@
-  Don't bother with finding the 1533 device and reading the register.
-  if ((....... & 0x0F) == 1)
-
+i2c-
-*/
-  pci_read_config_byte_united(ALI15X3_dev, ALI15X3_bus, ALI15X3_devfn, SMBREV, 
-                              &temp);
-
-
+i2c-
+i2c-
-#endif /* DEBUG */
-
@@ -341 +341 @@
-
-#ifdef DEBUG
-
+i2c-
-         "DAT1=%02x\n",
-         inb_p(SMBHSTSTS), inb_p(SMBHSTCNT),inb_p(SMBHSTCMD),inb_p(SMBHSTADD),inb_p(SMBHSTDAT0),
@@ -368 +368 @@
-/*
-#ifdef DEBUG
-
+i2c-
-#endif
-    outb_p(ALI15X3_ABORT, SMBHSTCNT);
@@ -381 +381 @@
-   If that's the case you are stuck.
-*/
-
+i2c-
-       outb_p(ALI15X3_T_OUT, SMBHSTCNT);
-       temp = inb_p(SMBHSTSTS);
@@ -397 +397 @@
-         as one of the bits now appears to be stuck */
-      /* This may be a bus or device with electrical problems. */
-
+i2c-
-      return -1;
-    }
@@ -420 +420 @@
-  if (timeout >= MAX_TIMEOUT) {
-    result = -1;
-
+i2c-
-  }
-
@@ -426 +426 @@
-    result = -1;
-#ifdef DEBUG
-
+i2c-
-#endif
-  }
@@ -439 +439 @@
-    result = -1;
-#ifdef DEBUG
-
+i2c-
-#endif
-  }
@@ -446 +446 @@
-  if (temp & ALI15X3_STS_DEV) {
-    result = -1;
-
+i2c-
-  }
-
-#ifdef DEBUG
-
+i2c-
-         "DAT0=%02x, DAT1=%02x\n",
-         inb_p(SMBHSTSTS), inb_p(SMBHSTCNT),inb_p(SMBHSTCMD),inb_p(SMBHSTADD),inb_p(SMBHSTDAT0),
@@ -476 +476 @@
-  }
-  if (timeout >= MAX_TIMEOUT) {
-
+i2c-
-  }
-
-  switch(size) {
-    case SMBUS_PROC_CALL:
-
+i2c-
-      return -1;
-    case SMBUS_QUICK:
@@ -564 +564 @@
-/* PE- It might be good to make this a permanent part of the code! */
-  if (ali15x3_initialized) {
-
+i2c-
-    return -EBUSY;
-  }
@@ -570 +570 @@
-  ali15x3_initialized = 0;
-  if ((res = ali15x3_setup())) {
-
+i2c-
-    ali15x3_cleanup();
-    return res;
@@ -583 +583 @@
-  ali15x3_adapter.smbus_access = &ali15x3_access;
-  if ((res = smbus_add_adapter(&ali15x3_adapter))) {
-
+i2c-
-    ali15x3_cleanup();
-    return res;
-  }
-  ali15x3_initialized++;
-
+i2c-
-  return 0;
-}
@@ -598 +598 @@
-  {
-    if ((res = smbus_del_adapter(&ali15x3_adapter))) {
-
+i2c-
-      return res;
-    } else

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

@@ -78 +78 @@
-{
-#ifdef DEBUG
-
+2c-i
-         "(no i2c level access possible!)\n",
-         adap->name);
@@ -89 +89 @@
-{
-#ifdef DEBUG
-
+2c-i
-         "(no i2c level access possible!)\n",
-         adap->name);
@@ -100 +100 @@
-{
-#ifdef DEBUG
-
+2c-i
-         "(no i2c level access possible!)\n",
-         adap->name);
@@ -133 +133 @@
-#ifdef DEBUG
-  if (isa_initialized) {
-
+2c-i
-    return -EBUSY;
-  }
@@ -139 +139 @@
-  isa_initialized = 0;
-  if ((res = isa_add_algorithm(&isa_algorithm))) {
-
+2c-i
-    isa_cleanup();
-    return res;
@@ -148 +148 @@
-  isa_adapter.algo = &isa_algorithm;
-  if ((res = isa_add_adapter(&isa_adapter))) {
-
+2c-i
-           "module isa.o is not inserted\n.");
-    isa_cleanup();
@@ -154 +154 @@
-  }
-  isa_initialized++;
-
+2c-i
-  return 0;
-}
@@ -164 +164 @@
-  {
-    if ((res = isa_del_adapter(&isa_adapter))) {
-
+2c-i
-      return res;
-    } else
@@ -172 +172 @@
-  {
-    if ((res = isa_del_algorithm(&isa_algorithm))) {
-
+2c-i
-      return res;
-    } else

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

@@ -108 +108 @@
-  /* First check whether we can access PCI at all */
-  if (pci_present() == 0) {
-
+i2c-
-    error_return=-ENODEV;
-    goto END;
@@ -132 +132 @@
-  if (res) {
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54) */
-
+i2c-
-    error_return=-ENODEV;
-    goto END;
@@ -143 +143 @@
-
-  if (check_region(piix4_smba, 8)) {
-
+i2c-
-    error_return=-ENODEV;
-    goto END;
@@ -162 +162 @@
-    pci_write_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
-                                     SMBHSTCFG, temp | 1);
-piix4.0
+i2c-piix4.o
-           "ENABLED!!\n");
-    /* Update configuration value */
@@ -182 +182 @@
-#ifdef DEBUG
-  if ((temp & 0x0E) == 8)
-
+i2c-
-  else if ((temp & 0x0E) == 0)
-
+i2c-
-  else 
-
+i2c-
-            "of date)!\n");
-
-  pci_read_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn, SMBREV, 
-                              &temp);
-
-
+i2c-
+i2c-
-#endif /* DEBUG */
-
@@ -215 +215 @@
-
-#ifdef DEBUG
-
+i2c-
-         "DAT1=%02x\n",
-         inb_p(SMBHSTCNT),inb_p(SMBHSTCMD),inb_p(SMBHSTADD),inb_p(SMBHSTDAT0),
@@ -224 +224 @@
-  if ((temp = inb_p(SMBHSTSTS)) != 0x00) {
-#ifdef DEBUG
-
+i2c-
-#endif
-    outb_p(temp, SMBHSTSTS);
-    if ((temp = inb_p(SMBHSTSTS)) != 0x00) {
-#ifdef DEBUG
-
+i2c-
-#endif
-      return -1;
-    } else {
-#ifdef DEBUG
-
+i2c-
-#endif
-    }
@@ -251 +251 @@
-  if (timeout >= MAX_TIMEOUT) {
-#ifdef DEBUG
-
+i2c-
-    result = -1;
-#endif
@@ -259 +259 @@
-    result = -1;
-#ifdef DEBUG
-
+i2c-
-#endif
-  }
@@ -265 +265 @@
-  if (temp & 0x08) {
-    result = -1;
-
+i2c-
-           reset. (sorry!)\n");
-    /* Clock stops and slave is stuck in mid-transmission */
@@ -273 +273 @@
-    result = -1;
-#ifdef DEBUG
-
+i2c-
-#endif
-  }
@@ -282 +282 @@
-  if ((temp = inb_p(SMBHSTSTS)) != 0x00) {
-#ifdef DEBUG
-
-
-
-
-
+i2c-
+
+
+
+i2c-
-         "DAT0=%02x, DAT1=%02x\n",
-         inb_p(SMBHSTCNT),inb_p(SMBHSTCMD),inb_p(SMBHSTADD),inb_p(SMBHSTDAT0),
@@ -302 +302 @@
-  switch(size) {
-    case SMBUS_PROC_CALL:
-
+i2c-
-      return -1;
-    case SMBUS_QUICK:
@@ -388 +388 @@
-/* PE- It might be good to make this a permanent part of the code! */
-  if (piix4_initialized) {
-
+i2c-
-    return -EBUSY;
-  }
@@ -394 +394 @@
-  piix4_initialized = 0;
-  if ((res = piix4_setup())) {
-
+i2c-
-    piix4_cleanup();
-    return res;
@@ -404 +404 @@
-  piix4_adapter.smbus_access = &piix4_access;
-  if ((res = smbus_add_adapter(&piix4_adapter))) {
-
+i2c-
-    piix4_cleanup();
-    return res;
-  }
-  piix4_initialized++;
-
+i2c-
-  return 0;
-}
@@ -419 +419 @@
-  {
-    if ((res = smbus_del_adapter(&piix4_adapter))) {
-
+i2c-
-      return res;
-    } else