gwj / at91sam9263 · Commits

Commit 5653494a49db20ca6b22b32fa07a73b9e2f26169

Authored by blueswir1
1 parent 3b898dda

Remove unused info_str parameter to pcnet_common_init() 

I noticed that pcnet_common_init() takes an unused 'info_str'
parameter, added in r2142.  Since then, we always pass "pcnet"
to register_savevm() (and never "lance").

Note that r6218 changed vc->info_str to "lance" for sun4m emulation.

On the assumption that it's not needed, this patch removes the
parameter.  If reverting the change in r2142, and registering with
"lance" would be preferable, I can submit a patch to do so.

Signed-off-by: Stuart Brady <stuart.brady@gmail.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6362 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
hw/pcnet.c
  View file @5653494
@@ -1929,7 +1929,7 @@ static int pcnet_load(QEMUFile *f, void *opaque, int version_id) @@ -1929,7 +1929,7 @@ static int pcnet_load(QEMUFile *f, void *opaque, int version_id)
1929 return 0; 1929 return 0;
1930 } 1930 }
1931 1931
1932 -static void pcnet_common_init(PCNetState *d, NICInfo *nd, const char *info_str) 1932 +static void pcnet_common_init(PCNetState *d, NICInfo *nd)
1933 { 1933 {
1934 d->poll_timer = qemu_new_timer(vm_clock, pcnet_poll_timer, d); 1934 d->poll_timer = qemu_new_timer(vm_clock, pcnet_poll_timer, d);
1935 1935
@@ -2032,7 +2032,7 @@ void pci_pcnet_init(PCIBus *bus, NICInfo *nd, int devfn) @@ -2032,7 +2032,7 @@ void pci_pcnet_init(PCIBus *bus, NICInfo *nd, int devfn)
2032 d->phys_mem_write = pci_physical_memory_write; 2032 d->phys_mem_write = pci_physical_memory_write;
2033 d->pci_dev = &d->dev; 2033 d->pci_dev = &d->dev;
2034 2034
2035 - pcnet_common_init(d, nd, "pcnet"); 2035 + pcnet_common_init(d, nd);
2036 } 2036 }
2037 2037
2038 /* SPARC32 interface */ 2038 /* SPARC32 interface */
@@ -2106,6 +2106,6 @@ void lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque, @@ -2106,6 +2106,6 @@ void lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque,
2106 d->phys_mem_read = ledma_memory_read; 2106 d->phys_mem_read = ledma_memory_read;
2107 d->phys_mem_write = ledma_memory_write; 2107 d->phys_mem_write = ledma_memory_write;
2108 2108
2109 - pcnet_common_init(d, nd, "lance"); 2109 + pcnet_common_init(d, nd);
2110 } 2110 }
2111 #endif /* TARGET_SPARC */ 2111 #endif /* TARGET_SPARC */