mfd: Use sysfs_emit() to instead of scnprintf()

[linux-2.6-microblaze.git] / drivers / mfd / lm3533-core.c

diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index be32ffc..946f94f 100644 (file)
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -286,7 +286,7 @@ static ssize_t show_output(struct device *dev,
 
        val = (val & mask) >> shift;
 
-       return scnprintf(buf, PAGE_SIZE, "%u\n", val);
+       return sysfs_emit(buf, "%u\n", val);
 }
 
 static ssize_t store_output(struct device *dev,
@@ -584,8 +584,7 @@ static const struct regmap_config regmap_config = {
        .precious_reg   = lm3533_precious_register,
 };
 
-static int lm3533_i2c_probe(struct i2c_client *i2c,
-                                       const struct i2c_device_id *id)
+static int lm3533_i2c_probe(struct i2c_client *i2c)
 {
        struct lm3533 *lm3533;
 
@@ -627,7 +626,7 @@ static struct i2c_driver lm3533_i2c_driver = {
                   .name = "lm3533",
        },
        .id_table       = lm3533_i2c_ids,
-       .probe          = lm3533_i2c_probe,
+       .probe_new      = lm3533_i2c_probe,
        .remove         = lm3533_i2c_remove,
 };