omap_l4: rename omap_l4_attach_region() to omap_l4_attach()

Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/hw/omap.h b/hw/omap.h
index 656251d34e768553f184bc14e5a564837995b63e..42eb361b21b84d095e1d1c8c58273ee7fd8e2c5c 100644 (file)
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -94,7 +94,7 @@ struct omap_target_agent_s *omap_l4ta_get(
     const struct omap_l4_region_s *regions,
     const struct omap_l4_agent_info_s *agents,
     int cs);
-target_phys_addr_t omap_l4_attach_region(struct omap_target_agent_s *ta,
+target_phys_addr_t omap_l4_attach(struct omap_target_agent_s *ta,
                                          int region, MemoryRegion *mr);
 target_phys_addr_t omap_l4_region_base(struct omap_target_agent_s *ta,
                                        int region);

diff --git a/hw/omap2.c b/hw/omap2.c
index 676e5d58eee09375567570581a0f2c11e8381f82..91577ae12881ca1e2b4a79527896b3bb2b63625e 100644 (file)
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -605,7 +605,7 @@ static struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta,
 
     memory_region_init_io(&s->iomem, &omap_eac_ops, s, "omap.eac",
                           omap_l4_region_size(ta, 0));
-    omap_l4_attach_region(ta, 0, &s->iomem);
+    omap_l4_attach(ta, 0, &s->iomem);
 
     return s;
 }
@@ -793,7 +793,7 @@ static struct omap_sti_s *omap_sti_init(struct omap_target_agent_s *ta,
 
     memory_region_init_io(&s->iomem, &omap_sti_ops, s, "omap.sti",
                           omap_l4_region_size(ta, 0));
-    omap_l4_attach_region(ta, 0, &s->iomem);
+    omap_l4_attach(ta, 0, &s->iomem);
 
     memory_region_init_io(&s->iomem_fifo, &omap_sti_fifo_ops, s,
                           "omap.sti.fifo", 0x10000);
@@ -1813,8 +1813,8 @@ static struct omap_prcm_s *omap_prcm_init(struct omap_target_agent_s *ta,
                           omap_l4_region_size(ta, 0));
     memory_region_init_io(&s->iomem1, &omap_prcm_ops, s, "omap.pcrm1",
                           omap_l4_region_size(ta, 1));
-    omap_l4_attach_region(ta, 0, &s->iomem0);
-    omap_l4_attach_region(ta, 1, &s->iomem1);
+    omap_l4_attach(ta, 0, &s->iomem0);
+    omap_l4_attach(ta, 1, &s->iomem1);
 
     return s;
 }
@@ -2187,7 +2187,7 @@ static struct omap_sysctl_s *omap_sysctl_init(struct omap_target_agent_s *ta,
 
     memory_region_init_io(&s->iomem, &omap_sysctl_ops, s, "omap.sysctl",
                           omap_l4_region_size(ta, 0));
-    omap_l4_attach_region(ta, 0, &s->iomem);
+    omap_l4_attach(ta, 0, &s->iomem);
 
     return s;
 }

diff --git a/hw/omap_dss.c b/hw/omap_dss.c
index 9e592ce316d4439ffae20a18ab359bc16731b65d..ede640b92e85591832d6e08d68a8ee8346618887 100644 (file)
--- a/hw/omap_dss.c
+++ b/hw/omap_dss.c
@@ -1064,10 +1064,10 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,
     memory_region_init_io(&s->iomem_im3, &omap_im3_ops, s,
                           "omap.im3", 0x1000);
 
-    omap_l4_attach_region(ta, 0, &s->iomem_diss1);
-    omap_l4_attach_region(ta, 1, &s->iomem_disc1);
-    omap_l4_attach_region(ta, 2, &s->iomem_rfbi1);
-    omap_l4_attach_region(ta, 3, &s->iomem_venc1);
+    omap_l4_attach(ta, 0, &s->iomem_diss1);
+    omap_l4_attach(ta, 1, &s->iomem_disc1);
+    omap_l4_attach(ta, 2, &s->iomem_rfbi1);
+    omap_l4_attach(ta, 3, &s->iomem_venc1);
     memory_region_add_subregion(sysmem, l3_base, &s->iomem_im3);
 
 #if 0

diff --git a/hw/omap_gptimer.c b/hw/omap_gptimer.c
index 414b98aa3662c64c3972b9f23c5cb76a497207ee..7a145198a42e5b98c955a9257cd46786f6c8f01b 100644 (file)
--- a/hw/omap_gptimer.c
+++ b/hw/omap_gptimer.c
@@ -482,7 +482,7 @@ struct omap_gp_timer_s *omap_gp_timer_init(struct omap_target_agent_s *ta,
 
     memory_region_init_io(&s->iomem, &omap_gp_timer_ops, s, "omap.gptimer",
                           omap_l4_region_size(ta, 0));
-    omap_l4_attach_region(ta, 0, &s->iomem);
+    omap_l4_attach(ta, 0, &s->iomem);
 
     return s;
 }

diff --git a/hw/omap_i2c.c b/hw/omap_i2c.c
index ca875f60860211d1766c5943284a777a28d4a84f..5ec422c566ba1f844d3cee516156e07884a06951 100644 (file)
--- a/hw/omap_i2c.c
+++ b/hw/omap_i2c.c
@@ -464,7 +464,7 @@ struct omap_i2c_s *omap2_i2c_init(struct omap_target_agent_s *ta,
 
     memory_region_init_io(&s->iomem, &omap_i2c_ops, s, "omap2.i2c",
                           omap_l4_region_size(ta, 0));
-    omap_l4_attach_region(ta, 0, &s->iomem);
+    omap_l4_attach(ta, 0, &s->iomem);
 
     return s;
 }

diff --git a/hw/omap_l4.c b/hw/omap_l4.c
index 78f02d993ed1860ad2797e49033473ce9eff703c..dbad7f67a8f38abc5d76c07f57cd8cfea549ec88 100644 (file)
--- a/hw/omap_l4.c
+++ b/hw/omap_l4.c
@@ -138,12 +138,12 @@ struct omap_target_agent_s *omap_l4ta_get(struct omap_l4_s *bus,
 
     memory_region_init_io(&ta->iomem, &omap_l4ta_ops, ta, "omap.l4ta",
                           omap_l4_region_size(ta, info->ta_region));
-    omap_l4_attach_region(ta, info->ta_region, &ta->iomem);
+    omap_l4_attach(ta, info->ta_region, &ta->iomem);
 
     return ta;
 }
 
-target_phys_addr_t omap_l4_attach_region(struct omap_target_agent_s *ta,
+target_phys_addr_t omap_l4_attach(struct omap_target_agent_s *ta,
                                          int region, MemoryRegion *mr)
 {
     target_phys_addr_t base;

diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c
index ba960c1c08d8159321bbcb7b961ae9c5c1566a61..aec0285675d2aacd7f6600c70542352276a16b39 100644 (file)
--- a/hw/omap_mmc.c
+++ b/hw/omap_mmc.c
@@ -614,7 +614,7 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta,
 
     memory_region_init_io(&s->iomem, &omap_mmc_ops, s, "omap.mmc",
                           omap_l4_region_size(ta, 0));
-    omap_l4_attach_region(ta, 0, &s->iomem);
+    omap_l4_attach(ta, 0, &s->iomem);
 
     /* Instantiate the storage */
     s->card = sd_init(bd, 0);

diff --git a/hw/omap_spi.c b/hw/omap_spi.c
index 4823bd0cdfab3f5bbc3a164cd0756668a2bc17dc..8f2b697d2d19332652af73820e69584d32101ce7 100644 (file)
--- a/hw/omap_spi.c
+++ b/hw/omap_spi.c
@@ -332,7 +332,7 @@ struct omap_mcspi_s *omap_mcspi_init(struct omap_target_agent_s *ta, int chnum,
 
     memory_region_init_io(&s->iomem, &omap_mcspi_ops, s, "omap.mcspi",
                           omap_l4_region_size(ta, 0));
-    omap_l4_attach_region(ta, 0, &s->iomem);
+    omap_l4_attach(ta, 0, &s->iomem);
 
     return s;
 }

diff --git a/hw/omap_synctimer.c b/hw/omap_synctimer.c
index cd1d7548d2896f0a6142feb916493d7f19a94d57..367f26e3a1ba8babb6caba43a7fa6998ddc78e7f 100644 (file)
--- a/hw/omap_synctimer.c
+++ b/hw/omap_synctimer.c
@@ -96,7 +96,7 @@ struct omap_synctimer_s *omap_synctimer_init(struct omap_target_agent_s *ta,
     omap_synctimer_reset(s);
     memory_region_init_io(&s->iomem, &omap_synctimer_ops, s, "omap.synctimer",
                           omap_l4_region_size(ta, 0));
-    omap_l4_attach_region(ta, 0, &s->iomem);
+    omap_l4_attach(ta, 0, &s->iomem);
 
     return s;
 }

diff --git a/hw/omap_tap.c b/hw/omap_tap.c
index 1b4820cebe2fb9f6071d929dc1bffbb86bf5a159..0277c736529a003f0785d732cfddb0e8ecda40f2 100644 (file)
--- a/hw/omap_tap.c
+++ b/hw/omap_tap.c
@@ -112,5 +112,5 @@ void omap_tap_init(struct omap_target_agent_s *ta,
 {
     memory_region_init_io(&mpu->tap_iomem, &omap_tap_ops, mpu, "omap.tap",
                           omap_l4_region_size(ta, 0));
-    omap_l4_attach_region(ta, 0, &mpu->tap_iomem);
+    omap_l4_attach(ta, 0, &mpu->tap_iomem);
 }

diff --git a/hw/omap_uart.c b/hw/omap_uart.c
index 64fc9f5c926ad90e55e1f103c805fa4ef038292a..167d5c4e5006cdb0502fa4a905aed3f83423bc73 100644 (file)
--- a/hw/omap_uart.c
+++ b/hw/omap_uart.c
@@ -165,7 +165,7 @@ struct omap_uart_s *omap2_uart_init(MemoryRegion *sysmem,
                 qemu_irq txdma, qemu_irq rxdma,
                 const char *label, CharDriverState *chr)
 {
-    target_phys_addr_t base = omap_l4_attach_region(ta, 0, NULL);
+    target_phys_addr_t base = omap_l4_attach(ta, 0, NULL);
     struct omap_uart_s *s = omap_uart_init(base, irq,
                     fclk, iclk, txdma, rxdma, label, chr);