drm/nouveau/subdev: rename some functions to avoid upcoming conflicts

[cascardo/linux.git] / drivers / mfd / sec-core.c

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index 0a7bc43..4a69afb 100644 (file)
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -68,6 +68,8 @@ static const struct mfd_cell s5m8767_devs[] = {
 static const struct mfd_cell s2mps11_devs[] = {
        {
                .name = "s2mps11-pmic",
+       }, {
+               .name = "s2mps14-rtc",
        }, {
                .name = "s2mps11-clk",
                .of_compatible = "samsung,s2mps11-clk",
@@ -267,10 +269,8 @@ static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata(
        struct sec_platform_data *pd;
 
        pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);
-       if (!pd) {
-               dev_err(dev, "could not allocate memory for pdata\n");
+       if (!pd)
                return ERR_PTR(-ENOMEM);
-       }
 
        /*
         * ToDo: the 'wakeup' member in the platform data is more of a linux
@@ -333,7 +333,6 @@ static int sec_pmic_probe(struct i2c_client *i2c,
        }
        if (pdata) {
                sec_pmic->device_type = pdata->device_type;
-               sec_pmic->ono = pdata->ono;
                sec_pmic->irq_base = pdata->irq_base;
                sec_pmic->wakeup = pdata->wakeup;
                sec_pmic->pdata = pdata;