staging: wilc1000: change compatible string from atmel to microchip

Use 'microchip' in compatible string instead of 'atmel', also replace '_'
with '-' before the module. Remove 'wilc1000' prefix from device table
name.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index 07cb8a6fae9c3465cd1d8e8613bf8b187f4732ea..afb91e5a5aa1cd144cdb81ff6c38ab9800a76e22 100644 (file)
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -199,21 +199,28 @@ static int wilc_sdio_resume(struct device *dev)
        return 0;
 }
 
+static const struct of_device_id wilc_of_match[] = {
+       { .compatible = "microchip,wilc1000-sdio", },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, wilc_of_match);
+
 static const struct dev_pm_ops wilc_sdio_pm_ops = {
        .suspend = wilc_sdio_suspend,
        .resume = wilc_sdio_resume,
 };
 
-static struct sdio_driver wilc1000_sdio_driver = {
+static struct sdio_driver wilc_sdio_driver = {
        .name           = SDIO_MODALIAS,
        .id_table       = wilc_sdio_ids,
        .probe          = linux_sdio_probe,
        .remove         = linux_sdio_remove,
        .drv = {
                .pm = &wilc_sdio_pm_ops,
+               .of_match_table = wilc_of_match,
        }
 };
-module_driver(wilc1000_sdio_driver,
+module_driver(wilc_sdio_driver,
              sdio_register_driver,
              sdio_unregister_driver);
 MODULE_LICENSE("GPL");

diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 8cb286b317ecf468560682e445428159291b6c23..7d4c7c5b586b96f9923b5b002ff0a31ae0eec253 100644 (file)
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -130,21 +130,21 @@ static int wilc_bus_remove(struct spi_device *spi)
        return 0;
 }
 
-static const struct of_device_id wilc1000_of_match[] = {
-       { .compatible = "atmel,wilc_spi", },
-       {}
+static const struct of_device_id wilc_of_match[] = {
+       { .compatible = "microchip,wilc1000-spi", },
+       { /* sentinel */ }
 };
-MODULE_DEVICE_TABLE(of, wilc1000_of_match);
+MODULE_DEVICE_TABLE(of, wilc_of_match);
 
-static struct spi_driver wilc1000_spi_driver = {
+static struct spi_driver wilc_spi_driver = {
        .driver = {
                .name = MODALIAS,
-               .of_match_table = wilc1000_of_match,
+               .of_match_table = wilc_of_match,
        },
        .probe =  wilc_bus_probe,
        .remove = wilc_bus_remove,
 };
-module_spi_driver(wilc1000_spi_driver);
+module_spi_driver(wilc_spi_driver);
 MODULE_LICENSE("GPL");
 
 static int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len)