mwifiex: fix typo in PCIe adapter NULL check

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / exynos / exynos_ddc.c

diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c b/drivers/gpu/drm/exynos/exynos_ddc.c
index 961a1806a24617ad27fe4a6523d5defeb972ab20..bef43e0342a69e82dcb7e91756158552c6ca8159 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_ddc.c
+++ b/drivers/gpu/drm/exynos/exynos_ddc.c
@@ -26,29 +26,43 @@ static int s5p_ddc_probe(struct i2c_client *client,
 {
        hdmi_attach_ddc_client(client);
 
-       dev_info(&client->adapter->dev, "attached s5p_ddc "
-               "into i2c adapter successfully\n");
+       dev_info(&client->adapter->dev,
+               "attached %s into i2c adapter successfully\n",
+               client->name);
 
        return 0;
 }
 
 static int s5p_ddc_remove(struct i2c_client *client)
 {
-       dev_info(&client->adapter->dev, "detached s5p_ddc "
-               "from i2c adapter successfully\n");
+       dev_info(&client->adapter->dev,
+               "detached %s from i2c adapter successfully\n",
+               client->name);
 
        return 0;
 }
 
 static struct i2c_device_id ddc_idtable[] = {
        {"s5p_ddc", 0},
+       {"exynos5-hdmiddc", 0},
        { },
 };
 
+#ifdef CONFIG_OF
+static struct of_device_id hdmiddc_match_types[] = {
+       {
+               .compatible = "samsung,exynos5-hdmiddc",
+       }, {
+               /* end node */
+       }
+};
+#endif
+
 struct i2c_driver ddc_driver = {
        .driver = {
-               .name = "s5p_ddc",
+               .name = "exynos-hdmiddc",
                .owner = THIS_MODULE,
+               .of_match_table = of_match_ptr(hdmiddc_match_types),
        },
        .id_table       = ddc_idtable,
        .probe          = s5p_ddc_probe,