Changeset 1692

Timestamp:

01/11/03 18:53:12 (10 years ago)

Author:

mds

Message:

backport from kernel 2.5.54 which contained changes from

Christoph Hellwig <hch@…> and Pavel <pavel@…>;
Leave in 3 things: refcounts, sensors.h, and init printk.

Files:

• lm-sensors/trunk/kernel/chips/adm1021.c (modified) (13 diffs)

lm-sensors/trunk/kernel/chips/adm1021.c

@@ -28 +28 @@
 #include <linux/init.h>
 
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \
-    (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0))
-#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
-#endif
-
-#ifndef THIS_MODULE
-#define THIS_MODULE NULL
-#endif
 
 /* Addresses to scan */
@@ -121 +109 @@
 };
 
-#ifdef MODULE
-extern int init_module(void);
-extern int cleanup_module(void);
-#endif                          /* MODULE */
-
-#ifdef MODULE
-static
-#else
-extern
-#endif
-int __init sensors_adm1021_init(void);
-static int __init adm1021_cleanup(void);
 static int adm1021_attach_adapter(struct i2c_adapter *adapter);
 static int adm1021_detect(struct i2c_adapter *adapter, int address,
@@ -163 +139 @@
 /* This is the driver that will be inserted */
 static struct i2c_driver adm1021_driver = {
-        /* name */ "ADM1021, MAX1617 sensor driver",
-        /* id */ I2C_DRIVERID_ADM1021,
-        /* flags */ I2C_DF_NOTIFY,
-        /* attach_adapter */ &adm1021_attach_adapter,
-        /* detach_client */ &adm1021_detach_client,
-        /* command */ &adm1021_command,
-        /* inc_use */ &adm1021_inc_use,
-        /* dec_use */ &adm1021_dec_use
+        .name           = "ADM1021, MAX1617 sensor driver",
+        .id             = I2C_DRIVERID_ADM1021,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = adm1021_attach_adapter,
+        .detach_client  = adm1021_detach_client,
+        .command        = adm1021_command,
+        .inc_use        = adm1021_inc_use,
+        .dec_use        = adm1021_dec_use
 };
 
@@ -200 +176 @@
 };
 
-/* Used by init/cleanup */
-static int __initdata adm1021_initialized = 0;
-
 /* I choose here for semi-static allocation. Complete dynamic
    allocation could also be used; the code needed for this would probably
@@ -234 +207 @@
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                goto ERROR0;
+                goto error0;
 
         /* OK. For now, we presume we have a valid client. We now create the
@@ -244 +217 @@
                                    GFP_KERNEL))) {
                 err = -ENOMEM;
-                goto ERROR0;
+                goto error0;
         }
 
@@ -260 +233 @@
                     (adm1021_read_value(new_client, ADM1021_REG_STATUS) &
                      0x03) != 0x00)
-                        goto ERROR1;
+                        goto error1;
         }
 
@@ -320 +293 @@
                        kind);
 #endif
-                goto ERROR1;
+                goto error1;
         }
 
@@ -333 +306 @@
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
-                goto ERROR3;
+                goto error3;
 
         /* Register a new directory entry with module sensors */
@@ -344 +317 @@
                                         THIS_MODULE)) < 0) {
                 err = i;
-                goto ERROR4;
+                goto error4;
         }
         data->sysctl_id = i;
@@ -352 +325 @@
         return 0;
 
-/* OK, this is not exactly good programming practice, usually. But it is
-   very code-efficient in this case. */
-
-      ERROR4:
+      error4:
         i2c_detach_client(new_client);
-      ERROR3:
-      ERROR1:
+      error3:
+      error1:
         kfree(new_client);
-      ERROR0:
+      error0:
         return err;
 }
@@ -525 +495 @@
                          int ctl_name, int *nrels_mag, long *results)
 {
-int prec=0;
         struct adm1021_data *data = client->data;
+        int prec = 0;
+
         if (operation == SENSORS_PROC_REAL_INFO)
                 if (data->type == adm1023) { *nrels_mag = 3; }
@@ -624 +595 @@
 }
 
-int __init sensors_adm1021_init(void)
-{
-        int res;
-
-        printk("adm1021.o version %s (%s)\n", LM_VERSION, LM_DATE);
-        adm1021_initialized = 0;
-        if ((res = i2c_add_driver(&adm1021_driver))) {
-                printk
-                    ("adm1021.o: Driver registration failed, module not inserted.\n");
-                adm1021_cleanup();
-                return res;
-        }
-        adm1021_initialized++;
-        return 0;
-}
-
-int __init adm1021_cleanup(void)
-{
-        int res;
-
-        if (adm1021_initialized >= 1) {
-                if ((res = i2c_del_driver(&adm1021_driver))) {
-                        printk
-                            ("adm1021.o: Driver deregistration failed, module not removed.\n");
-                        return res;
-                }
-                adm1021_initialized--;
-        }
-
-        return 0;
-}
-
-EXPORT_NO_SYMBOLS;
-
-#ifdef MODULE
+static int __init sensors_adm1021_init(void)
+{
+        printk(KERN_INFO "adm1021.o version %s (%s)\n", LM_VERSION, LM_DATE);
+        return i2c_add_driver(&adm1021_driver);
+}
+
+static void __exit sensors_adm1021_exit(void)
+{
+        i2c_del_driver(&adm1021_driver);
+}
 
 MODULE_AUTHOR
     ("Frodo Looijaard <frodol@dds.nl> and Philip Edelbrock <phil@netroedge.com>");
 MODULE_DESCRIPTION("adm1021 driver");
+MODULE_LICENSE("GPL");
 
 MODULE_PARM(read_only, "i");
 MODULE_PARM_DESC(read_only, "Don't set any values, read only mode");
 
-int init_module(void)
-{
-        return sensors_adm1021_init();
-}
-
-int cleanup_module(void)
-{
-        return adm1021_cleanup();
-}
-
-#endif                          /* MODULE */
+module_init(sensors_adm1021_init)
+module_exit(sensors_adm1021_exit)