Merge remote-tracking branch 'spice/spice.v39' into staging

[qemu.git] / hw / omap_clk.c

diff --git a/hw/omap_clk.c b/hw/omap_clk.c
index d7a5a577d40bfa900e20e4acd3d896d9beeddf7d..6bcabef8acb7112f6f44443820337a235e766ce4 100644 (file)
--- a/hw/omap_clk.c
+++ b/hw/omap_clk.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
 #include "omap.h"
@@ -1087,7 +1086,7 @@ static struct clk *onchip_clks[] = {
     &dss_l4_iclk,
     &omapctrl_clk,
 
-    0
+    NULL
 };
 
 void omap_clk_adduser(struct clk *clk, qemu_irq user)
@@ -1105,7 +1104,7 @@ struct clk *omap_findclk(struct omap_mpu_state_s *mpu, const char *name)
     for (i = mpu->clks; i->name; i ++)
         if (!strcmp(i->name, name) || (i->alias && !strcmp(i->alias, name)))
             return i;
-    cpu_abort(mpu->env, "%s: %s not found\n", __FUNCTION__, name);
+    hw_error("%s: %s not found\n", __FUNCTION__, name);
 }
 
 void omap_clk_get(struct clk *clk)
@@ -1116,8 +1115,7 @@ void omap_clk_get(struct clk *clk)
 void omap_clk_put(struct clk *clk)
 {
     if (!(clk->usecount --))
-        cpu_abort(cpu_single_env, "%s: %s is not in use\n",
-                        __FUNCTION__, clk->name);
+        hw_error("%s: %s is not in use\n", __FUNCTION__, clk->name);
 }
 
 static void omap_clk_update(struct clk *clk)
@@ -1186,7 +1184,7 @@ void omap_clk_reparent(struct clk *clk, struct clk *parent)
         omap_clk_update(clk);
         omap_clk_rate_update(clk);
     } else
-        clk->sibling = 0;
+        clk->sibling = NULL;
 }
 
 void omap_clk_onoff(struct clk *clk, int on)