Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...

[pandora-kernel.git] / Documentation / i2c / upgrading-clients

diff --git a/Documentation/i2c/upgrading-clients b/Documentation/i2c/upgrading-clients
index 9a45f9b..d699162 100644 (file)
--- a/Documentation/i2c/upgrading-clients
+++ b/Documentation/i2c/upgrading-clients
@@ -61,7 +61,7 @@ static int example_attach(struct i2c_adapter *adap, int addr, int kind)
        return 0;
 }
 
        return 0;
 }
 

-static int __devexit example_detach(struct i2c_client *client)
+static int example_detach(struct i2c_client *client)

 {
        struct example_state *state = i2c_get_clientdata(client);
 
 {
        struct example_state *state = i2c_get_clientdata(client);
 


@@ -81,7 +81,7 @@ static struct i2c_driver example_driver = {
                .name           = "example",
        },
        .attach_adapter = example_attach_adapter,
                .name           = "example",
        },
        .attach_adapter = example_attach_adapter,

-       .detach_client  = __devexit_p(example_detach),
+       .detach_client  = example_detach,

        .suspend        = example_suspend,
        .resume         = example_resume,
 };
        .suspend        = example_suspend,
        .resume         = example_resume,
 };


@@ -93,7 +93,7 @@ Updating the client
 The new style binding model will check against a list of supported
 devices and their associated address supplied by the code registering
 the busses. This means that the driver .attach_adapter and
 The new style binding model will check against a list of supported
 devices and their associated address supplied by the code registering
 the busses. This means that the driver .attach_adapter and

-.detach_adapter methods can be removed, along with the addr_data,
+.detach_client methods can be removed, along with the addr_data,

 as follows:
 
 - static struct i2c_driver example_driver;
 as follows:
 
 - static struct i2c_driver example_driver;


@@ -110,14 +110,14 @@ as follows:
 
  static struct i2c_driver example_driver = {
 -      .attach_adapter = example_attach_adapter,
 
  static struct i2c_driver example_driver = {
 -      .attach_adapter = example_attach_adapter,

--      .detach_client  = __devexit_p(example_detach),
+-      .detach_client  = example_detach,

  }
 
 Add the probe and remove methods to the i2c_driver, as so:
 
  static struct i2c_driver example_driver = {
 +      .probe          = example_probe,
  }
 
 Add the probe and remove methods to the i2c_driver, as so:
 
  static struct i2c_driver example_driver = {
 +      .probe          = example_probe,

-+      .remove         = __devexit_p(example_remove),
++      .remove         = example_remove,

  }
 
 Change the example_attach method to accept the new parameters
  }
 
 Change the example_attach method to accept the new parameters


@@ -199,8 +199,8 @@ to delete the i2c_detach_client call. It is possible that you
 can also remove the ret variable as it is not not needed for
 any of the core functions.
 
 can also remove the ret variable as it is not not needed for
 any of the core functions.
 

-- static int __devexit example_detach(struct i2c_client *client)
-+ static int __devexit example_remove(struct i2c_client *client)
+- static int example_detach(struct i2c_client *client)
++ static int example_remove(struct i2c_client *client)

 {
        struct example_state *state = i2c_get_clientdata(client);
 
 {
        struct example_state *state = i2c_get_clientdata(client);
 


@@ -253,7 +253,7 @@ static int example_probe(struct i2c_client *client,
        return 0;
 }
 
        return 0;
 }
 

-static int __devexit example_remove(struct i2c_client *client)
+static int example_remove(struct i2c_client *client)

 {
        struct example_state *state = i2c_get_clientdata(client);
 
 {
        struct example_state *state = i2c_get_clientdata(client);
 


@@ -275,7 +275,7 @@ static struct i2c_driver example_driver = {
        },
        .id_table       = example_idtable,
        .probe          = example_probe,
        },
        .id_table       = example_idtable,
        .probe          = example_probe,

-       .remove         = __devexit_p(example_remove),
+       .remove         = example_remove,

        .suspend        = example_suspend,
        .resume         = example_resume,
 };
        .suspend        = example_suspend,
        .resume         = example_resume,
 };