Changeset 3318 for i2c/trunk/kernel/i2c-philips-par.c

Timestamp:

07/18/99 16:01:33 (14 years ago)

Author:

frodo

Message:

Namespace and copyright clean-up

* All copyright headers now have the right filename in them
* Files without copyrights now have them
* All copyrights are now until 1999
* Copyright owners were not changed; files into which Kyösti or Frodo made

signifiant changes mention them now, though.

* External module symbols now all begin with i2c_ for all modules, except

some names which can't be changed (init_module and other module related
symbols).

* Header files define nothing which does not begin with i2c_ or I2C_.

That means some symbols have changed names!

The current files are completely namespace-clean. This will lessen the
chance of (future) clashes with other kernel symbols, especially if it
is patched into the kernel.

Files:

• i2c/trunk/kernel/i2c-philips-par.c (modified) (9 diffs)

i2c/trunk/kernel/i2c-philips-par.c

@@ -1 +1 @@
 /* ------------------------------------------------------------------------- */
-/* bit-lp.c i2c-hw access for philips style parallel port adapters           */
+/* i2c-philips-par.c i2c-hw access for philips style parallel port adapters  */
 /* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-97 Simon G. Vogl
+/*   Copyright (C) 1995-99 Simon G. Vogl
 
     This program is free software; you can redistribute it and/or modify
@@ -20 +20 @@
 static char rcsid[] = "$Id$";
    ------------------------------------------------------------------------- */
+
+/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
+   Frodo Looijaard <frodol@dds.nl> */
 
 #include <linux/kernel.h>
@@ -74 +77 @@
 /* ----- local functions ---------------------------------------------- */
 
-void bit_lp_setscl(void *data, int state)
+static void bit_lp_setscl(void *data, int state)
 {
         /*be cautious about state of the control register - 
@@ -85 +88 @@
 }
 
-void bit_lp_setsda(void *data, int state)
+static void bit_lp_setsda(void *data, int state)
 {
         if (state) {
@@ -94 +97 @@
 }
 
-int bit_lp_getscl(void *data)
+static int bit_lp_getscl(void *data)
 {
         return ( 0 != ( (inb(STAT)) & I2C_SCLIN ) );
 }
 
-int bit_lp_getsda(void *data)
+static int bit_lp_getsda(void *data)
 {
         return ( 0 != ( (inb(STAT)) & I2C_SDAIN ) );
 }
 
-int bit_lp_init(void)
+static int bit_lp_init(void)
 {
         if (check_region(base,(base == 0x3bc)? 3 : 8) < 0 ) {
@@ -118 +121 @@
 }
 
-void bit_lp_exit(void)
+static void bit_lp_exit(void)
 {
         release_region( base , (base == 0x3bc)? 3 : 8 );
 }
 
-int bit_lp_reg(struct i2c_client *client)
-{
-        return 0;
-}
-
-int bit_lp_unreg(struct i2c_client *client)
-{
-        return 0;
-}
-
-static void bit_lp_inc_use(struct bit_adapter *adap)
+static int bit_lp_reg(struct i2c_client *client)
+{
+        return 0;
+}
+
+static int bit_lp_unreg(struct i2c_client *client)
+{
+        return 0;
+}
+
+static void bit_lp_inc_use(struct i2c_bit_adapter *adap)
 {
   MOD_INC_USE_COUNT;
 }
 
-static void bit_lp_dec_use(struct bit_adapter *adap)
+static void bit_lp_dec_use(struct i2c_bit_adapter *adap)
 {
   MOD_DEC_USE_COUNT;
@@ -147 +150 @@
  * This is only done when more than one hardware adapter is supported.
  */
-struct bit_adapter bit_lp_ops = {
+static struct i2c_bit_adapter bit_lp_ops = {
         "Philips Parallel port adapter",
-        HW_B_LP,
+        I2C_HW_B_LP,
         NULL,
         bit_lp_setsda,
@@ -163 +166 @@
 
 
-int __init bitlp_init(void)
+int __init i2c_bitlp_init(void)
 {
         if (base==0) {
@@ -196 +199 @@
 int init_module(void) 
 {
-        return bitlp_init();
+        return i2c_bitlp_init();
 }