Skip to content

Commit

Permalink
sh: hwblk: Kill off hwblk_id from pdev archdata.
Browse files Browse the repository at this point in the history 
Now that nothing is using this anymore, kill off the assignments across
the board.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Nov 18, 2011
1 parent 4be8873 commit ec20a81
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 241 deletions.
12 changes: 0 additions & 12 deletions arch/sh/boards/mach-ap325rxa/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,6 @@ static struct platform_device lcdc_device = {
.dev = {
.platform_data = &lcdc_info,
},
.archdata = {
.hwblk_id = HWBLK_LCDC,
},
};

static void camera_power(int val)
Expand Down Expand Up @@ -424,9 +421,6 @@ static struct platform_device ceu_device = {
.dev = {
.platform_data = &sh_mobile_ceu_info,
},
.archdata = {
.hwblk_id = HWBLK_CEU,
},
};

static struct resource sdhi0_cn3_resources[] = {
Expand Down Expand Up @@ -454,9 +448,6 @@ static struct platform_device sdhi0_cn3_device = {
.dev = {
.platform_data = &sdhi0_cn3_data,
},
.archdata = {
.hwblk_id = HWBLK_SDHI0,
},
};

static struct resource sdhi1_cn7_resources[] = {
Expand Down Expand Up @@ -484,9 +475,6 @@ static struct platform_device sdhi1_cn7_device = {
.dev = {
.platform_data = &sdhi1_cn7_data,
},
.archdata = {
.hwblk_id = HWBLK_SDHI1,
},
};

static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
Expand Down
36 changes: 0 additions & 36 deletions arch/sh/boards/mach-ecovec24/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ static struct platform_device sh_eth_device = {
},
.num_resources = ARRAY_SIZE(sh_eth_resources),
.resource = sh_eth_resources,
.archdata = {
.hwblk_id = HWBLK_ETHER,
},
};

/* USB0 host */
Expand Down Expand Up @@ -278,9 +275,6 @@ static struct platform_device usbhs_device = {
},
.num_resources = ARRAY_SIZE(usbhs_resources),
.resource = usbhs_resources,
.archdata = {
.hwblk_id = HWBLK_USB1,
},
};

/* LCDC */
Expand Down Expand Up @@ -366,9 +360,6 @@ static struct platform_device lcdc_device = {
.dev = {
.platform_data = &lcdc_info,
},
.archdata = {
.hwblk_id = HWBLK_LCDC,
},
};

/* CEU0 */
Expand Down Expand Up @@ -400,9 +391,6 @@ static struct platform_device ceu0_device = {
.dev = {
.platform_data = &sh_mobile_ceu0_info,
},
.archdata = {
.hwblk_id = HWBLK_CEU0,
},
};

/* CEU1 */
Expand Down Expand Up @@ -434,9 +422,6 @@ static struct platform_device ceu1_device = {
.dev = {
.platform_data = &sh_mobile_ceu1_info,
},
.archdata = {
.hwblk_id = HWBLK_CEU1,
},
};

/* I2C device */
Expand Down Expand Up @@ -491,9 +476,6 @@ static struct platform_device keysc_device = {
.dev = {
.platform_data = &keysc_info,
},
.archdata = {
.hwblk_id = HWBLK_KEYSC,
},
};

/* TouchScreen */
Expand Down Expand Up @@ -568,9 +550,6 @@ static struct platform_device sdhi0_device = {
.dev = {
.platform_data = &sdhi0_info,
},
.archdata = {
.hwblk_id = HWBLK_SDHI0,
},
};

#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
Expand Down Expand Up @@ -608,9 +587,6 @@ static struct platform_device sdhi1_device = {
.dev = {
.platform_data = &sdhi1_info,
},
.archdata = {
.hwblk_id = HWBLK_SDHI1,
},
};
#endif /* CONFIG_MMC_SH_MMCIF */

Expand Down Expand Up @@ -676,9 +652,6 @@ static struct platform_device msiof0_device = {
},
.num_resources = ARRAY_SIZE(msiof0_resources),
.resource = msiof0_resources,
.archdata = {
.hwblk_id = HWBLK_MSIOF0,
},
};

#endif
Expand Down Expand Up @@ -818,9 +791,6 @@ static struct platform_device fsi_device = {
.dev = {
.platform_data = &fsi_info,
},
.archdata = {
.hwblk_id = HWBLK_SPU, /* FSI needs SPU hwblk */
},
};

/* IrDA */
Expand Down Expand Up @@ -882,9 +852,6 @@ static struct platform_device vou_device = {
.dev = {
.platform_data = &sh_vou_pdata,
},
.archdata = {
.hwblk_id = HWBLK_VOU,
},
};

#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
Expand Down Expand Up @@ -936,9 +903,6 @@ static struct platform_device sh_mmcif_device = {
},
.num_resources = ARRAY_SIZE(sh_mmcif_resources),
.resource = sh_mmcif_resources,
.archdata = {
.hwblk_id = HWBLK_MMC,
},
};
#endif

Expand Down
12 changes: 0 additions & 12 deletions arch/sh/boards/mach-kfr2r09/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ static struct platform_device kfr2r09_sh_keysc_device = {
.dev = {
.platform_data = &kfr2r09_sh_keysc_info,
},
.archdata = {
.hwblk_id = HWBLK_KEYSC,
},
};

static const struct fb_videomode kfr2r09_lcdc_modes[] = {
Expand Down Expand Up @@ -191,9 +188,6 @@ static struct platform_device kfr2r09_sh_lcdc_device = {
.dev = {
.platform_data = &kfr2r09_sh_lcdc_info,
},
.archdata = {
.hwblk_id = HWBLK_LCDC,
},
};

static struct r8a66597_platdata kfr2r09_usb0_gadget_data = {
Expand Down Expand Up @@ -254,9 +248,6 @@ static struct platform_device kfr2r09_ceu_device = {
.dev = {
.platform_data = &sh_mobile_ceu_info,
},
.archdata = {
.hwblk_id = HWBLK_CEU0,
},
};

static struct i2c_board_info kfr2r09_i2c_camera = {
Expand Down Expand Up @@ -377,9 +368,6 @@ static struct platform_device kfr2r09_sh_sdhi0_device = {
.dev = {
.platform_data = &sh7724_sdhi0_data,
},
.archdata = {
.hwblk_id = HWBLK_SDHI0,
},
};

static struct platform_device *kfr2r09_devices[] __initdata = {
Expand Down
12 changes: 0 additions & 12 deletions arch/sh/boards/mach-migor/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ static struct platform_device sh_keysc_device = {
.dev = {
.platform_data = &sh_keysc_info,
},
.archdata = {
.hwblk_id = HWBLK_KEYSC,
},
};

static struct mtd_partition migor_nor_flash_partitions[] =
Expand Down Expand Up @@ -300,9 +297,6 @@ static struct platform_device migor_lcdc_device = {
.dev = {
.platform_data = &sh_mobile_lcdc_info,
},
.archdata = {
.hwblk_id = HWBLK_LCDC,
},
};

static struct clk *camera_clk;
Expand Down Expand Up @@ -390,9 +384,6 @@ static struct platform_device migor_ceu_device = {
.dev = {
.platform_data = &sh_mobile_ceu_info,
},
.archdata = {
.hwblk_id = HWBLK_CEU,
},
};

static struct resource sdhi_cn9_resources[] = {
Expand Down Expand Up @@ -421,9 +412,6 @@ static struct platform_device sdhi_cn9_device = {
.dev = {
.platform_data = &sh7724_sdhi_data,
},
.archdata = {
.hwblk_id = HWBLK_SDHI,
},
};

static struct i2c_board_info migor_i2c_devices[] = {
Expand Down
3 changes: 0 additions & 3 deletions arch/sh/boards/mach-se/7722/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ static struct platform_device sh_keysc_device = {
.dev = {
.platform_data = &sh_keysc_info,
},
.archdata = {
.hwblk_id = HWBLK_KEYSC,
},
};

static struct platform_device *se7722_devices[] __initdata = {
Expand Down
30 changes: 0 additions & 30 deletions arch/sh/boards/mach-se/7724/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,6 @@ static struct platform_device lcdc_device = {
.dev = {
.platform_data = &lcdc_info,
},
.archdata = {
.hwblk_id = HWBLK_LCDC,
},
};

/* CEU0 */
Expand Down Expand Up @@ -244,9 +241,6 @@ static struct platform_device ceu0_device = {
.dev = {
.platform_data = &sh_mobile_ceu0_info,
},
.archdata = {
.hwblk_id = HWBLK_CEU0,
},
};

/* CEU1 */
Expand Down Expand Up @@ -278,9 +272,6 @@ static struct platform_device ceu1_device = {
.dev = {
.platform_data = &sh_mobile_ceu1_info,
},
.archdata = {
.hwblk_id = HWBLK_CEU1,
},
};

/* FSI */
Expand Down Expand Up @@ -310,9 +301,6 @@ static struct platform_device fsi_device = {
.dev = {
.platform_data = &fsi_info,
},
.archdata = {
.hwblk_id = HWBLK_SPU, /* FSI needs SPU hwblk */
},
};

static struct platform_device fsi_ak4642_device = {
Expand Down Expand Up @@ -355,9 +343,6 @@ static struct platform_device keysc_device = {
.dev = {
.platform_data = &keysc_info,
},
.archdata = {
.hwblk_id = HWBLK_KEYSC,
},
};

/* SH Eth */
Expand Down Expand Up @@ -386,9 +371,6 @@ static struct platform_device sh_eth_device = {
},
.num_resources = ARRAY_SIZE(sh_eth_resources),
.resource = sh_eth_resources,
.archdata = {
.hwblk_id = HWBLK_ETHER,
},
};

static struct r8a66597_platdata sh7724_usb0_host_data = {
Expand Down Expand Up @@ -418,9 +400,6 @@ static struct platform_device sh7724_usb0_host_device = {
},
.num_resources = ARRAY_SIZE(sh7724_usb0_host_resources),
.resource = sh7724_usb0_host_resources,
.archdata = {
.hwblk_id = HWBLK_USB0,
},
};

static struct r8a66597_platdata sh7724_usb1_gadget_data = {
Expand Down Expand Up @@ -479,9 +458,6 @@ static struct platform_device sdhi0_cn7_device = {
.dev = {
.platform_data = &sh7724_sdhi0_data,
},
.archdata = {
.hwblk_id = HWBLK_SDHI0,
},
};

static struct resource sdhi1_cn8_resources[] = {
Expand Down Expand Up @@ -511,9 +487,6 @@ static struct platform_device sdhi1_cn8_device = {
.dev = {
.platform_data = &sh7724_sdhi1_data,
},
.archdata = {
.hwblk_id = HWBLK_SDHI1,
},
};

/* IrDA */
Expand Down Expand Up @@ -576,9 +549,6 @@ static struct platform_device vou_device = {
.dev = {
.platform_data = &sh_vou_pdata,
},
.archdata = {
.hwblk_id = HWBLK_VOU,
},
};

static struct platform_device *ms7724se_devices[] __initdata = {
Expand Down
1 change: 0 additions & 1 deletion arch/sh/include/asm/device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ int platform_resource_setup_memory(struct platform_device *pdev,
void plat_early_device_setup(void);

struct pdev_archdata {
int hwblk_id;
};
Loading

0 comments on commit ec20a81

Please sign in to comment.