diff options
author | Akinobu Mita <mita@miraclelinux.com> | 2006-06-26 03:24:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 12:58:17 -0400 |
commit | a7addcea6ac7c0e9733a48cda06ca0880f116a48 (patch) | |
tree | 5d18b98798c98dd2c044f4a9ed9c7b372c599a9c | |
parent | 8e13059a37252c45ab7173a0e4bac05e4a444ab6 (diff) |
[PATCH] arch: use list_move()
This patch converts the combination of list_del(A) and list_add(A, B) to
list_move(A, B) under arch/.
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/i386/pci/pcbios.c | 6 | ||||
-rw-r--r-- | arch/m68k/mm/memory.c | 6 | ||||
-rw-r--r-- | arch/m68k/sun3/sun3dvma.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c index 1eec0868f4b3..ed1512a175ab 100644 --- a/arch/i386/pci/pcbios.c +++ b/arch/i386/pci/pcbios.c | |||
@@ -371,8 +371,7 @@ void __devinit pcibios_sort(void) | |||
371 | list_for_each(ln, &pci_devices) { | 371 | list_for_each(ln, &pci_devices) { |
372 | d = pci_dev_g(ln); | 372 | d = pci_dev_g(ln); |
373 | if (d->bus->number == bus && d->devfn == devfn) { | 373 | if (d->bus->number == bus && d->devfn == devfn) { |
374 | list_del(&d->global_list); | 374 | list_move_tail(&d->global_list, &sorted_devices); |
375 | list_add_tail(&d->global_list, &sorted_devices); | ||
376 | if (d == dev) | 375 | if (d == dev) |
377 | found = 1; | 376 | found = 1; |
378 | break; | 377 | break; |
@@ -390,8 +389,7 @@ void __devinit pcibios_sort(void) | |||
390 | if (!found) { | 389 | if (!found) { |
391 | printk(KERN_WARNING "PCI: Device %s not found by BIOS\n", | 390 | printk(KERN_WARNING "PCI: Device %s not found by BIOS\n", |
392 | pci_name(dev)); | 391 | pci_name(dev)); |
393 | list_del(&dev->global_list); | 392 | list_move_tail(&dev->global_list, &sorted_devices); |
394 | list_add_tail(&dev->global_list, &sorted_devices); | ||
395 | } | 393 | } |
396 | } | 394 | } |
397 | list_splice(&sorted_devices, &pci_devices); | 395 | list_splice(&sorted_devices, &pci_devices); |
diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c index d6d582a5abb0..a226668f20c3 100644 --- a/arch/m68k/mm/memory.c +++ b/arch/m68k/mm/memory.c | |||
@@ -94,8 +94,7 @@ pmd_t *get_pointer_table (void) | |||
94 | PD_MARKBITS(dp) = mask & ~tmp; | 94 | PD_MARKBITS(dp) = mask & ~tmp; |
95 | if (!PD_MARKBITS(dp)) { | 95 | if (!PD_MARKBITS(dp)) { |
96 | /* move to end of list */ | 96 | /* move to end of list */ |
97 | list_del(dp); | 97 | list_move_tail(dp, &ptable_list); |
98 | list_add_tail(dp, &ptable_list); | ||
99 | } | 98 | } |
100 | return (pmd_t *) (page_address(PD_PAGE(dp)) + off); | 99 | return (pmd_t *) (page_address(PD_PAGE(dp)) + off); |
101 | } | 100 | } |
@@ -123,8 +122,7 @@ int free_pointer_table (pmd_t *ptable) | |||
123 | * move this descriptor to the front of the list, since | 122 | * move this descriptor to the front of the list, since |
124 | * it has one or more free tables. | 123 | * it has one or more free tables. |
125 | */ | 124 | */ |
126 | list_del(dp); | 125 | list_move(dp, &ptable_list); |
127 | list_add(dp, &ptable_list); | ||
128 | } | 126 | } |
129 | return 0; | 127 | return 0; |
130 | } | 128 | } |
diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c index f04a1d25f1a2..97c7bfde8ae8 100644 --- a/arch/m68k/sun3/sun3dvma.c +++ b/arch/m68k/sun3/sun3dvma.c | |||
@@ -119,8 +119,7 @@ static inline int refill(void) | |||
119 | if(hole->end == prev->start) { | 119 | if(hole->end == prev->start) { |
120 | hole->size += prev->size; | 120 | hole->size += prev->size; |
121 | hole->end = prev->end; | 121 | hole->end = prev->end; |
122 | list_del(&(prev->list)); | 122 | list_move(&(prev->list), &hole_cache); |
123 | list_add(&(prev->list), &hole_cache); | ||
124 | ret++; | 123 | ret++; |
125 | } | 124 | } |
126 | 125 | ||
@@ -182,8 +181,7 @@ static inline unsigned long get_baddr(int len, unsigned long align) | |||
182 | #endif | 181 | #endif |
183 | return hole->end; | 182 | return hole->end; |
184 | } else if(hole->size == newlen) { | 183 | } else if(hole->size == newlen) { |
185 | list_del(&(hole->list)); | 184 | list_move(&(hole->list), &hole_cache); |
186 | list_add(&(hole->list), &hole_cache); | ||
187 | dvma_entry_use(hole->start) = newlen; | 185 | dvma_entry_use(hole->start) = newlen; |
188 | #ifdef DVMA_DEBUG | 186 | #ifdef DVMA_DEBUG |
189 | dvma_allocs++; | 187 | dvma_allocs++; |