aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-23 11:29:43 -0500
committerBen Dooks <ben-linux@fluff.org>2009-02-26 18:21:49 -0500
commit027191a8c6602d3fb6dde3820517339e1daf191d (patch)
tree07f11a890d0cbc51a15fdf8b8f71be1e154f65b3 /arch
parent778974797793e7dcd42e3701e09c686b6419cb35 (diff)
[ARM] SMDK6410: Declare iodesc table static
Shuts up a warning. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c6410/mach-smdk6410.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c
index 0436783c87d4..25f7935576f8 100644
--- a/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
@@ -129,7 +129,7 @@ static struct s3c_fb_platdata smdk6410_lcd_pdata __initdata = {
129 .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, 129 .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
130}; 130};
131 131
132struct map_desc smdk6410_iodesc[] = {}; 132static struct map_desc smdk6410_iodesc[] = {};
133 133
134static struct platform_device *smdk6410_devices[] __initdata = { 134static struct platform_device *smdk6410_devices[] __initdata = {
135#ifdef CONFIG_SMDK6410_SD_CH0 135#ifdef CONFIG_SMDK6410_SD_CH0
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-11 15:42:56 -0500
* md=n,device-list reads a RAID superblock from the devices * elements in device-list are read by name_to_kdev_t so can be * a hex number or something like /dev/hda1 /dev/sdb * 2001-06-03: Dave Cinege <dcinege@psychosis.com> * Shifted name_to_kdev_t() and related operations to md_set_drive() * for later execution. Rewrote section to make devfs compatible. */ static int __init md_setup(char *str) { int minor, level, factor, fault, partitioned = 0; char *pername = ""; char *str1; int ent; if (*str == 'd') { partitioned = 1; str++; } if (get_option(&str, &minor) != 2) { /* MD Number */ printk(KERN_WARNING "md: Too few arguments supplied to md=.\n"); return 0; } str1 = str; for (ent=0 ; ent< md_setup_ents ; ent++) if (md_setup_args[ent].minor == minor && md_setup_args[ent].partitioned == partitioned) { printk(KERN_WARNING "md: md=%s%d, Specified more than once. " "Replacing previous definition.\n", partitioned?"d":"", minor); break; } if (ent >= ARRAY_SIZE(md_setup_args)) { printk(KERN_WARNING "md: md=%s%d - too many md initialisations\n", partitioned?"d":"", minor); return 0; } if (ent >= md_setup_ents) md_setup_ents++; switch (get_option(&str, &level)) { /* RAID level */ case 2: /* could be 0 or -1.. */ if (level == 0 || level == LEVEL_LINEAR) { if (get_option(&str, &factor) != 2 || /* Chunk Size */ get_option(&str, &fault) != 2) { printk(KERN_WARNING "md: Too few arguments supplied to md=.\n"); return 0; } md_setup_args[ent].level = level; md_setup_args[ent].chunk = 1 << (factor+12); if (level == LEVEL_LINEAR) pername = "linear"; else pername = "raid0"; break; } /* FALL THROUGH */ case 1: /* the first device is numeric */ str = str1; /* FALL THROUGH */ case 0: md_setup_args[ent].level = LEVEL_NONE; pername="super-block"; } printk(KERN_INFO "md: Will configure md%d (%s) from %s, below.\n", minor, pername, str); md_setup_args[ent].device_names = str; md_setup_args[ent].partitioned = partitioned; md_setup_args[ent].minor = minor; return 1; } static void __init md_setup_drive(void) { int minor, i, ent, partitioned; dev_t dev; dev_t devices[MD_SB_DISKS+1]; for (ent = 0; ent < md_setup_ents ; ent++) { int fd; int err = 0; char *devname; mdu_disk_info_t dinfo; char name[16]; minor = md_setup_args[ent].minor; partitioned = md_setup_args[ent].partitioned; devname = md_setup_args[ent].device_names; sprintf(name, "/dev/md%s%d", partitioned?"_d":"", minor); if (partitioned) dev = MKDEV(mdp_major, minor << MdpMinorShift); else dev = MKDEV(MD_MAJOR, minor); create_dev(name, dev); for (i = 0; i < MD_SB_DISKS && devname != NULL; i++) { char *p; char comp_name[64]; u32 rdev; p = strchr(devname, ','); if (p) *p++ = 0; dev = name_to_dev_t(devname); if (strncmp(devname, "/dev/", 5) == 0) devname += 5; snprintf(comp_name, 63, "/dev/%s", devname); rdev = bstat(comp_name); if (rdev) dev = new_decode_dev(rdev); if (!dev) { printk(KERN_WARNING "md: Unknown device name: %s\n", devname); break; } devices[i] = dev; devname = p; } devices[i] = 0; if (!i) continue; printk(KERN_INFO "md: Loading md%s%d: %s\n", partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); fd = sys_open(name, 0, 0); if (fd < 0) { printk(KERN_ERR "md: open failed - cannot start " "array %s\n", name); continue; } if (sys_ioctl(fd, SET_ARRAY_INFO, 0) == -EBUSY) { printk(KERN_WARNING "md: Ignoring md=%d, already autodetected. (Use raid=noautodetect)\n", minor); sys_close(fd); continue; } if (md_setup_args[ent].level != LEVEL_NONE) { /* non-persistent */ mdu_array_info_t ainfo; ainfo.level = md_setup_args[ent].level; ainfo.size = 0; ainfo.nr_disks =0; ainfo.raid_disks =0; while (devices[ainfo.raid_disks]) ainfo.raid_disks++; ainfo.md_minor =minor; ainfo.not_persistent = 1; ainfo.state = (1 << MD_SB_CLEAN); ainfo.layout = 0; ainfo.chunk_size = md_setup_args[ent].chunk; err = sys_ioctl(fd, SET_ARRAY_INFO, (long)&ainfo); for (i = 0; !err && i <= MD_SB_DISKS; i++) { dev = devices[i]; if (!dev) break; dinfo.number = i; dinfo.raid_disk = i; dinfo.state = (1<<MD_DISK_ACTIVE)|(1<<MD_DISK_SYNC); dinfo.major = MAJOR(dev); dinfo.minor = MINOR(dev); err = sys_ioctl(fd, ADD_NEW_DISK, (long)&dinfo); } } else { /* persistent */ for (i = 0; i <= MD_SB_DISKS; i++) { dev = devices[i]; if (!dev) break; dinfo.major = MAJOR(dev); dinfo.minor = MINOR(dev); sys_ioctl(fd, ADD_NEW_DISK, (long)&dinfo); } } if (!err) err = sys_ioctl(fd, RUN_ARRAY, 0); if (err) printk(KERN_WARNING "md: starting md%d failed\n", minor); else { /* reread the partition table. * I (neilb) and not sure why this is needed, but I cannot * boot a kernel with devfs compiled in from partitioned md * array without it */ sys_close(fd); fd = sys_open(name, 0, 0); sys_ioctl(fd, BLKRRPART, 0); } sys_close(fd); } } static int __init raid_setup(char *str) { int len, pos; len = strlen(str) + 1; pos = 0; while (pos < len) { char *comma = strchr(str+pos, ','); int wlen; if (comma) wlen = (comma-str)-pos; else wlen = (len-1)-pos; if (!strncmp(str, "noautodetect", wlen)) raid_noautodetect = 1; if (!strncmp(str, "autodetect", wlen)) raid_noautodetect = 0; if (strncmp(str, "partitionable", wlen)==0) raid_autopart = 1; if (strncmp(str, "part", wlen)==0) raid_autopart = 1; pos += wlen+1; } return 1; } __setup("raid=", raid_setup); __setup("md=", md_setup); static void __init autodetect_raid(void) { int fd; /* * Since we don't want to detect and use half a raid array, we need to * wait for the known devices to complete their probing */ printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n"); printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n"); wait_for_device_probe(); fd = sys_open((const char __user __force *) "/dev/md0", 0, 0); if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); } } void __init md_run_setup(void) { create_dev("/dev/md0", MKDEV(MD_MAJOR, 0)); if (raid_noautodetect) printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=autodetect will force)\n"); else autodetect_raid(); md_setup_drive(); }
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-11 15:42:56 -0500