ramips: rt305x: remove per-board physmap_flash_data instances

[openwrt/openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-hw550-3g.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
index 08ee40a9148d85310e8bcca117ddd111142691af..ce328988ea1bf9eb27536b0ceaf543c9f335438e 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
@@ -65,11 +65,6 @@ static struct mtd_partition hw550_3g_partitions[] = {
        }
 };
 
-static struct physmap_flash_data hw550_3g_flash_data = {
-       .nr_parts       = ARRAY_SIZE(hw550_3g_partitions),
-       .parts          = hw550_3g_partitions,
-};
-
 static struct gpio_led hw550_3g_leds_gpio[] __initdata = {
        {
                .name           = "hw550-3g:green:usb",
@@ -123,7 +118,10 @@ static void __init hw550_3g_init(void)
 {
        rt305x_gpio_init(HW550_3G_GPIO_MODE);
 
-       rt305x_register_flash(0, &hw550_3g_flash_data);
+       rt305x_flash0_data.nr_parts = ARRAY_SIZE(hw550_3g_partitions);
+       rt305x_flash0_data.parts = hw550_3g_partitions;
+       rt305x_register_flash(0);
+
        rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_WLLLL;
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(hw550_3g_leds_gpio),