3 files changed, 33 insertions, 73 deletions

diff --git a/lib/iomap.c b/lib/iomap.c
index 4d43f37c0154..a57d262a5ed9 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -35,20 +35,28 @@
 #define PIO_RESERVED    0x40000UL
 #endif
 
+static void bad_io_access(unsigned long port, const char *access)
+{
+        static int count = 10;
+        if (count) {
+                count--;
+                printk(KERN_ERR "Bad IO access at port %lx (%s)\n", port, access);
+                WARN_ON(1);
+        }
+}
+
 /*
  * Ugly macros are a way of life.
  */
-#define VERIFY_PIO(port) BUG_ON((port & ~PIO_MASK) != PIO_OFFSET)
-
 #define IO_COND(addr, is_pio, is_mmio) do {                     \
         unsigned long port = (unsigned long __force)addr;       \
-        if (port < PIO_RESERVED) {                              \
-                VERIFY_PIO(port);                               \
+        if (port >= PIO_RESERVED) {                             \
+                is_mmio;                                        \
+        } else if (port > PIO_OFFSET) {                         \
                 port &= PIO_MASK;                               \
                 is_pio;                                         \
-        } else {                                                \
-                is_mmio;                                        \
-        }                                                       \
+        } else                                                  \
+                bad_io_access(port, #is_pio );                  \
 } while (0)
 
 #ifndef pio_read16be
@@ -64,22 +72,27 @@
 unsigned int fastcall ioread8(void __iomem *addr)
 {
         IO_COND(addr, return inb(port), return readb(addr));
+        return 0xff;
 }
 unsigned int fastcall ioread16(void __iomem *addr)
 {
         IO_COND(addr, return inw(port), return readw(addr));
+        return 0xffff;
 }
 unsigned int fastcall ioread16be(void __iomem *addr)
 {
         IO_COND(addr, return pio_read16be(port), return mmio_read16be(addr));
+        return 0xffff;
 }
 unsigned int fastcall ioread32(void __iomem *addr)
 {
         IO_COND(addr, return inl(port), return readl(addr));
+        return 0xffffffff;
 }
 unsigned int fastcall ioread32be(void __iomem *addr)
 {
         IO_COND(addr, return pio_read32be(port), return mmio_read32be(addr));
+        return 0xffffffff;
 }
 EXPORT_SYMBOL(ioread8);
 EXPORT_SYMBOL(ioread16);
diff --git a/lib/kobject.c b/lib/kobject.c
index cecf2fbede3e..fc5f3f6e7329 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -582,22 +582,10 @@ void kset_init(struct kset * k)
 /**
  *      kset_add - add a kset object to the hierarchy.
  *      @k:     kset.
- *
- *      Simply, this adds the kset's embedded kobject to the 
- *      hierarchy. 
- *      We also try to make sure that the kset's embedded kobject
- *      has a parent before it is added. We only care if the embedded
- *      kobject is not part of a kset itself, since kobject_add()
- *      assigns a parent in that case. 
- *      If that is the case, and the kset has a controlling subsystem,
- *      then we set the kset's parent to be said subsystem. 
  */
 
 int kset_add(struct kset * k)
 {
-        if (!k->kobj.parent && !k->kobj.kset && k->subsys)
-                k->kobj.parent = &k->subsys->kset.kobj;
-
         return kobject_add(&k->kobj);
 }
 
@@ -656,53 +644,28 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name)
         return ret;
 }
 
-
-void subsystem_init(struct subsystem * s)
+void subsystem_init(struct kset *s)
 {
-        kset_init(&s->kset);
+        kset_init(s);
 }
 
-/**
- *      subsystem_register - register a subsystem.
- *      @s:     the subsystem we're registering.
- *
- *      Once we register the subsystem, we want to make sure that 
- *      the kset points back to this subsystem.
- */
-
-int subsystem_register(struct subsystem * s)
+int subsystem_register(struct kset *s)
 {
-        int error;
-
-        if (!s)
-                return -EINVAL;
-
-        subsystem_init(s);
-        pr_debug("subsystem %s: registering\n",s->kset.kobj.name);
-
-        if (!(error = kset_add(&s->kset))) {
-                if (!s->kset.subsys)
-                        s->kset.subsys = s;
-        }
-        return error;
+        return kset_register(s);
 }
 
-void subsystem_unregister(struct subsystem * s)
+void subsystem_unregister(struct kset *s)
 {
-        if (!s)
-                return;
-        pr_debug("subsystem %s: unregistering\n",s->kset.kobj.name);
-        kset_unregister(&s->kset);
+        kset_unregister(s);
 }
 
-
 /**
  *      subsystem_create_file - export sysfs attribute file.
  *      @s:     subsystem.
  *      @a:     subsystem attribute descriptor.
  */
 
-int subsys_create_file(struct subsystem * s, struct subsys_attribute * a)
+int subsys_create_file(struct kset *s, struct subsys_attribute *a)
 {
         int error = 0;
 
@@ -710,28 +673,12 @@ int subsys_create_file(struct subsystem * s, struct subsys_attribute * a)
                 return -EINVAL;
 
         if (subsys_get(s)) {
-                error = sysfs_create_file(&s->kset.kobj,&a->attr);
+                error = sysfs_create_file(&s->kobj, &a->attr);
                 subsys_put(s);
         }
         return error;
 }
 
-
-/**
- *      subsystem_remove_file - remove sysfs attribute file.
- *      @s:     subsystem.
- *      @a:     attribute desciptor.
- */
-#if 0
-void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a)
-{
-        if (subsys_get(s)) {
-                sysfs_remove_file(&s->kset.kobj,&a->attr);
-                subsys_put(s);
-        }
-}
-#endif  /*  0  */
-
 EXPORT_SYMBOL(kobject_init);
 EXPORT_SYMBOL(kobject_register);
 EXPORT_SYMBOL(kobject_unregister);
diff --git a/lib/parser.c b/lib/parser.c
index 7ad2a48abc5e..703c8c13b346 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -22,7 +22,7 @@
  * match extremely simple token=arg style patterns. If the pattern is found,
  * the location(s) of the arguments will be returned in the @args array.
  */
-static int match_one(char *s, char *p, substring_t args[])
+static int match_one(char *s, const char *p, substring_t args[])
 {
         char *meta;
         int argc = 0;
@@ -43,7 +43,7 @@ static int match_one(char *s, char *p, substring_t args[])
                 p = meta + 1;
 
                 if (isdigit(*p))
-                        len = simple_strtoul(p, &p, 10);
+                        len = simple_strtoul(p, (char **) &p, 10);
                 else if (*p == '%') {
                         if (*s++ != '%')
                                 return 0;
@@ -102,7 +102,7 @@ static int match_one(char *s, char *p, substring_t args[])
  */
 int match_token(char *s, match_table_t table, substring_t args[])
 {
-        struct match_token *p;
+        const struct match_token *p;
 
         for (p = table; !match_one(s, p->pattern, args) ; p++)
                 ;
@@ -190,7 +190,7 @@ int match_hex(substring_t *s, int *result)
  * &substring_t @s to the c-style string @to. Caller guarantees that @to is
  * large enough to hold the characters of @s.
  */
-void match_strcpy(char *to, substring_t *s)
+void match_strcpy(char *to, const substring_t *s)
 {
         memcpy(to, s->from, s->to - s->from);
         to[s->to - s->from] = '\0';
@@ -204,7 +204,7 @@ void match_strcpy(char *to, substring_t *s)
  * the &substring_t @s. The caller is responsible for freeing the returned
  * string with kfree().
  */
-char *match_strdup(substring_t *s)
+char *match_strdup(const substring_t *s)
 {
         char *p = kmalloc(s->to - s->from + 1, GFP_KERNEL);
         if (p)