Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits)
  m68k: Define sigcontext ABI of ColdFire
  m68knommu: NPTL support for uClinux
  m68k: Add NPTL support
  m68k: Eliminate unused variable in page_to_phys()
  m68k: Switch to generic siginfo layout
  macfb: fix 24-bit visual and stuff
  macfb: cleanup
  fbdev: add some missing mac modes
  mac68k: start CUDA early
  valkyriefb: various fixes
  fbdev: mac_var_to_mode() fix
  mac68k: move macsonic and macmace platform devices
  mac68k: move mac_esp platform device
  mac68k: replace mac68k SCC code with platform device
  pmac-zilog: add platform driver
  pmac-zilog: cleanup
  mac68k: rework SWIM platform device
  mac68k: cleanup
  ataflop: Killl warning about unused variable flags
  m68k: Use DIV_ROUND_CLOSEST
  ...

1 files changed, 4 insertions, 29 deletions

diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index 875d361fb79d..24109c288108 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -62,7 +62,6 @@
 #include <asm/mac_via.h>
 
 static char mac_sonic_string[] = "macsonic";
-static struct platform_device *mac_sonic_device;
 
 #include "sonic.h"
 
@@ -607,6 +606,7 @@ out:
 MODULE_DESCRIPTION("Macintosh SONIC ethernet driver");
 module_param(sonic_debug, int, 0);
 MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)");
+MODULE_ALIAS("platform:macsonic");
 
 #include "sonic.c"
 
@@ -627,44 +627,19 @@ static struct platform_driver mac_sonic_driver = {
         .probe  = mac_sonic_probe,
         .remove = __devexit_p(mac_sonic_device_remove),
         .driver = {
-                .name = mac_sonic_string,
+                .name   = mac_sonic_string,
+                .owner  = THIS_MODULE,
         },
 };
 
 static int __init mac_sonic_init_module(void)
 {
-        int err;
-
-        if ((err = platform_driver_register(&mac_sonic_driver))) {
-                printk(KERN_ERR "Driver registration failed\n");
-                return err;
-        }
-
-        mac_sonic_device = platform_device_alloc(mac_sonic_string, 0);
-        if (!mac_sonic_device)
-                goto out_unregister;
-
-        if (platform_device_add(mac_sonic_device)) {
-                platform_device_put(mac_sonic_device);
-                mac_sonic_device = NULL;
-        }
-
-        return 0;
-
-out_unregister:
-        platform_driver_unregister(&mac_sonic_driver);
-
-        return -ENOMEM;
+        return platform_driver_register(&mac_sonic_driver);
 }
 
 static void __exit mac_sonic_cleanup_module(void)
 {
         platform_driver_unregister(&mac_sonic_driver);
-
-        if (mac_sonic_device) {
-                platform_device_unregister(mac_sonic_device);
-                mac_sonic_device = NULL;
-        }
 }
 
 module_init(mac_sonic_init_module);