chris: struct device - replace bus_id with dev_name(), dev_set_name()

Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/arch/cris/arch-v32/drivers/iop_fw_load.c b/arch/cris/arch-v32/drivers/iop_fw_load.c
index 3b3857ec1f15f6753d0b2c2ff6c690f619a54890..2f8ea0f7a63c30e77f7948b404bc74618cc6e421 100644 (file)
--- a/arch/cris/arch-v32/drivers/iop_fw_load.c
+++ b/arch/cris/arch-v32/drivers/iop_fw_load.c
@@ -24,12 +24,12 @@
 #error "Please contact <greg@kroah.com> for details on how to fix it properly."
 
 static struct device iop_spu_device[2] = {
-       { .bus_id =     "iop-spu0", },
-       { .bus_id =     "iop-spu1", },
+       { .init_name =     "iop-spu0", },
+       { .init_name =     "iop-spu1", },
 };
 
 static struct device iop_mpu_device = {
-       .bus_id =       "iop-mpu",
+       .init_name =       "iop-mpu",
 };
 
 static int wait_mpu_idle(void)