SGI: struct device - replace bus_id with dev_name(), dev_set_name() (bb0dc43e) · Commits · 戴 / test

drivers/misc/sgi-gru/grumain.c

+1 −1

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

	static struct device gru_device = {		static struct device gru_device = {
	.bus_id = {0},		.init_name = "",
	.driver = &gru_driver,		.driver = &gru_driver,
	};		};

+1 −1

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

	struct device xp_dbg_subname = {		struct device xp_dbg_subname = {
	.bus_id = {0}, /* set to "" */		.init_name = "", /* set to "" */
	.driver = &xp_dbg_name		.driver = &xp_dbg_name
	};		};

+4 −4

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

	struct device xpc_part_dbg_subname = {		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		.driver = &xpc_dbg_name
	};		};

	struct device xpc_chan_dbg_subname = {		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		.driver = &xpc_dbg_name
	};		};

	@@ -1258,8 +1258,8 @@ xpc_init(void)
	int ret;		int ret;
	struct task_struct *kthread;		struct task_struct *kthread;

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

	if (is_shub()) {		if (is_shub()) {
	/*		/*

+1 −1

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

	struct device xpnet_dbg_subname = {		struct device xpnet_dbg_subname = {
	.bus_id = {0}, /* set to "" */		.init_name = "", /* set to "" */
	.driver = &xpnet_dbg_name		.driver = &xpnet_dbg_name
	};		};