TPM: Switch to __packed instead of __attribute__((packed))

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / ath79_wdt.c

diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 7c8ede7816b1a1efacf9a196648bcfb2b5bc4c0c..38a999e60c0d7f26f03b2eac77f39e4b2296413a 100644 (file)
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -284,6 +284,7 @@ static void ath97_wdt_shutdown(struct platform_device *pdev)
 }
 
 static struct platform_driver ath79_wdt_driver = {
+       .probe          = ath79_wdt_probe,
        .remove         = ath79_wdt_remove,
        .shutdown       = ath97_wdt_shutdown,
        .driver         = {
@@ -292,17 +293,7 @@ static struct platform_driver ath79_wdt_driver = {
        },
 };
 
-static int __init ath79_wdt_init(void)
-{
-       return platform_driver_probe(&ath79_wdt_driver, ath79_wdt_probe);
-}
-module_init(ath79_wdt_init);
-
-static void __exit ath79_wdt_exit(void)
-{
-       platform_driver_unregister(&ath79_wdt_driver);
-}
-module_exit(ath79_wdt_exit);
+module_platform_driver(ath79_wdt_driver);
 
 MODULE_DESCRIPTION("Atheros AR71XX/AR724X/AR913X hardware watchdog driver");
 MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org");