Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb0dc43e authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



CC: Jack Steiner <steiner@sgi.com>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 35f74fca

drivers/misc/sgi-gru/grumain.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static struct device_driver gru_driver = { 
};



static struct device gru_device = {

	.bus_id = {0},

	.init_name = "",

	.driver = &gru_driver,

};

drivers/misc/sgi-xp/xp_main.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct device_driver xp_dbg_name = { 
};



struct device xp_dbg_subname = {

	.bus_id = {0},		/* set to "" */

	.init_name = "",		/* set to "" */

	.driver = &xp_dbg_name

};

drivers/misc/sgi-xp/xpc_main.c

+4 −4
Original line number Diff line number Diff line
@@ -59,12 +59,12 @@ struct device_driver xpc_dbg_name = { 
};



struct device xpc_part_dbg_subname = {

	.bus_id = {0},		/* set to "part" at xpc_init() time */

	.init_name = "",	/* set to "part" at xpc_init() time */

	.driver = &xpc_dbg_name

};



struct device xpc_chan_dbg_subname = {

	.bus_id = {0},		/* set to "chan" at xpc_init() time */

	.init_name = "",	/* set to "chan" at xpc_init() time */

	.driver = &xpc_dbg_name

};
@@ -1258,8 +1258,8 @@ xpc_init(void) 
	int ret;

	struct task_struct *kthread;



	snprintf(xpc_part->bus_id, BUS_ID_SIZE, "part");

	snprintf(xpc_chan->bus_id, BUS_ID_SIZE, "chan");

	dev_set_name(xpc_part, "part");

	dev_set_name(xpc_chan, "chan");



	if (is_shub()) {

		/*

drivers/misc/sgi-xp/xpnet.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ struct device_driver xpnet_dbg_name = { 
};



struct device xpnet_dbg_subname = {

	.bus_id = {0},		/* set to "" */

	.init_name = "",	/* set to "" */

	.driver = &xpnet_dbg_name

};