These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mfd / kempld-core.c

diff --git a/kernel/drivers/mfd/kempld-core.c b/kernel/drivers/mfd/kempld-core.c
index 8057849..05b9245 100644 (file)
--- a/kernel/drivers/mfd/kempld-core.c
+++ b/kernel/drivers/mfd/kempld-core.c
@@ -448,7 +448,6 @@ static int kempld_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct kempld_device_data *pld;
        struct resource *ioport;
-       int ret;
 
        pld = devm_kzalloc(dev, sizeof(*pld), GFP_KERNEL);
        if (!pld)
@@ -471,11 +470,7 @@ static int kempld_probe(struct platform_device *pdev)
        mutex_init(&pld->lock);
        platform_set_drvdata(pdev, pld);
 
-       ret = kempld_detect_device(pld);
-       if (ret)
-               return ret;
-
-       return 0;
+       return kempld_detect_device(pld);
 }
 
 static int kempld_remove(struct platform_device *pdev)
@@ -501,6 +496,14 @@ static struct platform_driver kempld_driver = {
 
 static struct dmi_system_id kempld_dmi_table[] __initdata = {
        {
+               .ident = "BBL6",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "COMe-bBL6"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
+       }, {
                .ident = "BHL6",
                .matches = {
                        DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
@@ -516,6 +519,14 @@ static struct dmi_system_id kempld_dmi_table[] __initdata = {
                },
                .driver_data = (void *)&kempld_platform_data_generic,
                .callback = kempld_create_platform_device,
+       }, {
+               .ident = "CBW6",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "COMe-cBW6"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
        }, {
                .ident = "CCR2",
                .matches = {
@@ -740,7 +751,6 @@ MODULE_DEVICE_TABLE(dmi, kempld_dmi_table);
 static int __init kempld_init(void)
 {
        const struct dmi_system_id *id;
-       int ret;
 
        if (force_device_id[0]) {
                for (id = kempld_dmi_table;
@@ -755,11 +765,7 @@ static int __init kempld_init(void)
                        return -ENODEV;
        }
 
-       ret = platform_driver_register(&kempld_driver);
-       if (ret)
-               return ret;
-
-       return 0;
+       return platform_driver_register(&kempld_driver);
 }
 
 static void __exit kempld_exit(void)