From: Kitae Kim <kt920.kim@samsung.com>
Date: Mon, 14 Apr 2014 08:43:56 +0000 (+0900)
Subject: brillcodec: remove init function
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~386^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e037feaf2fb56e74c2fdafd1d744d42125dc2c1;p=sdk%2Femulator%2Fqemu.git

brillcodec: remove init function

init fucntion of this device is called when qemu launched with codec-pci parameter.

Change-Id: I2cb155c5807d4f5e2637d756b18514d9dc2d70fa
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

Conflicts:
	tizen/src/hw/maru_brill_codec.c
---

diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c
index 12c10c18c7..39c96b876d 100644
--- a/tizen/src/hw/maru_board.c
+++ b/tizen/src/hw/maru_board.c
@@ -84,10 +84,6 @@ extern int enable_spice;
 
 #define MAX_IDE_BUS 2
 
-#if defined(CONFIG_LIBAV)
-int maru_brill_codec_pci_device_init(PCIBus *bus);
-#endif
-
 static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
 static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
 static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
@@ -121,9 +117,6 @@ static void maru_device_init(void)
 
     pci_maru_overlay_init(pci_bus);
     pci_maru_brightness_init(pci_bus);
-#if defined(CONFIG_LIBAV)
-    maru_brill_codec_pci_device_init(pci_bus);
-#endif
 
     if (enable_vigs || enable_yagl) {
         render_queue = work_queue_create("render_queue");
diff --git a/tizen/src/hw/maru_brill_codec.c b/tizen/src/hw/maru_brill_codec.c
index 9b22a117b3..0ef27e47ae 100644
--- a/tizen/src/hw/maru_brill_codec.c
+++ b/tizen/src/hw/maru_brill_codec.c
@@ -34,7 +34,7 @@
 MULTI_DEBUG_CHANNEL(qemu, brillcodec);
 
 // device
-#define CODEC_DEVICE_NAME   "brillcodec"
+#define CODEC_DEVICE_NAME   "codec-pci"
 #define CODEC_DEVICE_THREAD "codec-workthread"
 #define CODEC_VERSION       2
 
@@ -2016,10 +2016,3 @@ static void codec_register_types(void)
 }
 
 type_init(codec_register_types)
-
-int maru_brill_codec_pci_device_init(PCIBus *bus)
-{
-    INFO("device create.\n");
-    pci_create_simple(bus, -1, CODEC_DEVICE_NAME);
-    return 0;
-}