|
@@ -590,7 +590,6 @@ static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop)
|
|
|
|
|
|
static int dlpar_add_lmb_memory(struct of_drconf_cell *lmb)
|
|
|
{
|
|
|
- struct memory_block *mem_block;
|
|
|
unsigned long block_sz;
|
|
|
int nid, rc;
|
|
|
|
|
@@ -611,19 +610,6 @@ static int dlpar_add_lmb_memory(struct of_drconf_cell *lmb)
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
|
- mem_block = lmb_to_memblock(lmb);
|
|
|
- if (!mem_block) {
|
|
|
- remove_memory(nid, lmb->base_addr, block_sz);
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
-
|
|
|
- rc = device_online(&mem_block->dev);
|
|
|
- put_device(&mem_block->dev);
|
|
|
- if (rc) {
|
|
|
- remove_memory(nid, lmb->base_addr, block_sz);
|
|
|
- return rc;
|
|
|
- }
|
|
|
-
|
|
|
lmb->flags |= DRCONF_MEM_ASSIGNED;
|
|
|
return 0;
|
|
|
}
|