From: Randy Dunlap <randy.dunlap@oracle•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>, gregkh@suse•de
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>
Subject: [PATCH -next] driver core: fix build for CONFIG_BLOCK not enabled
Date: Fri, 24 Sep 2010 14:36:49 -0700 [thread overview]
Message-ID: <20100924143649.59f0572a.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20100924145537.bd092bfb.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle•com>
Fix build errors when CONFIG_BLOCK is not enabled:
drivers/base/core.c: In function 'get_device_parent':
drivers/base/core.c:634: error: 'block_class' undeclared (first use in this function)
drivers/base/core.c: In function 'device_add_class_symlinks':
drivers/base/core.c:723: error: 'block_class' undeclared (first use in this function)
drivers/base/core.c: In function 'device_remove_class_symlinks':
drivers/base/core.c:751: error: 'block_class' undeclared (first use in this function)
Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com>
---
drivers/base/core.c | 6 ++++++
1 file changed, 6 insertions(+)
--- linux-next-20100924.orig/drivers/base/core.c
+++ linux-next-20100924/drivers/base/core.c
@@ -630,12 +630,14 @@ static struct kobject *get_device_parent
struct kobject *parent_kobj;
struct kobject *k;
+#ifdef CONFIG_BLOCK
/* block disks show up in /sys/block */
if (sysfs_deprecated && dev->class == &block_class) {
if (parent && parent->class == &block_class)
return &parent->kobj;
return &block_class.p->class_subsys.kobj;
}
+#endif
/*
* If we have no parent, we live in "virtual".
@@ -719,9 +721,11 @@ static int device_add_class_symlinks(str
goto out_subsys;
}
+#ifdef CONFIG_BLOCK
/* /sys/block has directories and does not need symlinks */
if (sysfs_deprecated && dev->class == &block_class)
return 0;
+#endif
/* link in the class directory pointing to the device */
error = sysfs_create_link(&dev->class->p->class_subsys.kobj,
@@ -748,8 +752,10 @@ static void device_remove_class_symlinks
if (dev->parent && device_is_not_partition(dev))
sysfs_remove_link(&dev->kobj, "device");
sysfs_remove_link(&dev->kobj, "subsystem");
+#ifdef CONFIG_BLOCK
if (sysfs_deprecated && dev->class == &block_class)
return;
+#endif
sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));
}
prev parent reply other threads:[~2010-09-24 21:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 4:55 linux-next: Tree for September 24 Stephen Rothwell
2010-09-24 15:54 ` linux-next: Tree for September 24 (block/blk-throttle) Randy Dunlap
2010-09-24 21:36 ` Randy Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100924143649.59f0572a.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=gregkh@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox