arm: struct device - replace bus_id with dev_name(), dev_set_name() (1d559e29) · Commits · 戴 / test

arch/arm/kernel/ecard.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -817,7 +817,7 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
		ec->dma = NO_DMA;
		ec->ops = &ecard_default_ops;

		snprintf(ec->dev.bus_id, sizeof(ec->dev.bus_id), "ecard%d", slot);
		dev_set_name(&ec->dev, "ecard%d", slot);
		ec->dev.parent = NULL;
		ec->dev.bus = &ecard_bus_type;
		ec->dev.dma_mask = &ec->dma_mask;

+1 −1

Original line number	Diff line number	Diff line
		@@ -212,7 +212,7 @@ static struct clcd_board clcd_plat_data = {

		static struct amba_device clcd_device = {
		.dev = {
		.bus_id = "mb:16",
		.init_name = "mb:16",
		.coherent_dma_mask = ~0,
		.platform_data = &clcd_plat_data,
		},

+3 −3

Original line number	Diff line number	Diff line
		@@ -409,7 +409,7 @@ static struct amba_pl010_data ep93xx_uart_data = {

		static struct amba_device uart1_device = {
		.dev = {
		.bus_id = "apb:uart1",
		.init_name = "apb:uart1",
		.platform_data = &ep93xx_uart_data,
		},
		.res = {
		@@ -423,7 +423,7 @@ static struct amba_device uart1_device = {

		static struct amba_device uart2_device = {
		.dev = {
		.bus_id = "apb:uart2",
		.init_name = "apb:uart2",
		.platform_data = &ep93xx_uart_data,
		},
		.res = {
		@@ -437,7 +437,7 @@ static struct amba_device uart2_device = {

		static struct amba_device uart3_device = {
		.dev = {
		.bus_id = "apb:uart3",
		.init_name = "apb:uart3",
		.platform_data = &ep93xx_uart_data,
		},
		.res = {

+5 −5

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ static struct amba_pl010_data integrator_uart_data;

		static struct amba_device rtc_device = {
		.dev = {
		.bus_id = "mb:15",
		.init_name = "mb:15",
		},
		.res = {
		.start = INTEGRATOR_RTC_BASE,
		@@ -50,7 +50,7 @@ static struct amba_device rtc_device = {

		static struct amba_device uart0_device = {
		.dev = {
		.bus_id = "mb:16",
		.init_name = "mb:16",
		.platform_data = &integrator_uart_data,
		},
		.res = {
		@@ -64,7 +64,7 @@ static struct amba_device uart0_device = {

		static struct amba_device uart1_device = {
		.dev = {
		.bus_id = "mb:17",
		.init_name = "mb:17",
		.platform_data = &integrator_uart_data,
		},
		.res = {
		@@ -78,7 +78,7 @@ static struct amba_device uart1_device = {

		static struct amba_device kmi0_device = {
		.dev = {
		.bus_id = "mb:18",
		.init_name = "mb:18",
		},
		.res = {
		.start = KMI0_BASE,
		@@ -91,7 +91,7 @@ static struct amba_device kmi0_device = {

		static struct amba_device kmi1_device = {
		.dev = {
		.bus_id = "mb:19",
		.init_name = "mb:19",
		},
		.res = {
		.start = KMI1_BASE,

+3 −3

Original line number	Diff line number	Diff line
		@@ -407,7 +407,7 @@ static struct mmc_platform_data mmc_data = {

		static struct amba_device mmc_device = {
		.dev = {
		.bus_id = "mb:1c",
		.init_name = "mb:1c",
		.platform_data = &mmc_data,
		},
		.res = {
		@@ -421,7 +421,7 @@ static struct amba_device mmc_device = {

		static struct amba_device aaci_device = {
		.dev = {
		.bus_id = "mb:1d",
		.init_name = "mb:1d",
		},
		.res = {
		.start = INTCP_PA_AACI_BASE,
		@@ -532,7 +532,7 @@ static struct clcd_board clcd_data = {

		static struct amba_device clcd_device = {
		.dev = {
		.bus_id = "mb:c0",
		.init_name = "mb:c0",
		.coherent_dma_mask = ~0,
		.platform_data = &clcd_data,
		},