Forcing the "interrupts" property to the value of zero is not necessary, and is incompatible with the IRQ mapping schema introduced in the previous commit
Signed-off-by: Artyom Tarasenko atar4qemu@gmail.com --- drivers/ide.c | 2 -- drivers/pci.c | 8 -------- drivers/pci_database.c | 4 ++-- drivers/pci_database.h | 1 - 4 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/ide.c b/drivers/ide.c index 251db65..125b9ce 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -1432,8 +1432,6 @@ int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, props[0]=14; props[1]=0; set_property(dnode, "interrupts", (char *)&props, 2*sizeof(props[0])); -#elif defined(CONFIG_SPARC64) - set_int_property(get_cur_dev(), "interrupts", 0); #endif
props[0] = __cpu_to_be32(chan->io_regs[0]); diff --git a/drivers/pci.c b/drivers/pci.c index ec1a810..d6b768f 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -537,14 +537,6 @@ int bridge_config_cb(const pci_config_t *config) return 0; }
-int virtio_config_cb(const pci_config_t *config) -{ -#if defined(CONFIG_SPARC64) - set_int_property(get_cur_dev(), "interrupts", 0); -#endif - return 0; -} - int ide_config_cb2 (const pci_config_t *config) { ob_ide_init(config->path, diff --git a/drivers/pci_database.c b/drivers/pci_database.c index 197f27e..dd93ea7 100644 --- a/drivers/pci_database.c +++ b/drivers/pci_database.c @@ -52,7 +52,7 @@ static const pci_dev_t scsi_devices[] = { NULL, "virtio-scsi", NULL, "pci1af4,1001\0pci1af4,1001\0pciclass,01018f\0", 0, 0, 0, - virtio_config_cb, NULL, + NULL, NULL, }, { 0xFFFF, 0xFFFF, @@ -134,7 +134,7 @@ static const pci_dev_t eth_devices[] = { NULL, "virtio-net", NULL, "pci1af4,1000\0pci1af4,1000\0pciclass,020000\0", 0, 0, 0, - virtio_config_cb, NULL, + NULL, NULL, }, { 0xFFFF, 0xFFFF, diff --git a/drivers/pci_database.h b/drivers/pci_database.h index 5459032..5ddbb20 100644 --- a/drivers/pci_database.h +++ b/drivers/pci_database.h @@ -28,7 +28,6 @@ struct pci_dev_t { const void *private; };
-extern int virtio_config_cb(const pci_config_t *config); extern int ide_config_cb2(const pci_config_t *config); extern int eth_config_cb(const pci_config_t *config); extern int macio_heathrow_config_cb(const pci_config_t *config);