driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices
This patch removes the old CONFIG_SYSFS_DEPRECATED_V2 config option, but it keeps the logic around to handle block devices in the old manner as some people like to run new kernel versions on old (pre 2007/2008) distros. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Cc: Jens Axboe <axboe@kernel.dk> Cc: Stephen Hemminger <shemminger@vyatta.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: "James E.J. Bottomley" <James.Bottomley@suse.de> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Tejun Heo <tj@kernel.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
807508c8ff
commit
39aba963d9
@@ -133,9 +133,7 @@ struct snd_card {
|
||||
int free_on_last_close; /* free in context of file_release */
|
||||
wait_queue_head_t shutdown_sleep;
|
||||
struct device *dev; /* device assigned to this card */
|
||||
#ifndef CONFIG_SYSFS_DEPRECATED
|
||||
struct device *card_dev; /* cardX object for sysfs */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
unsigned int power_state; /* power state */
|
||||
@@ -196,11 +194,7 @@ struct snd_minor {
|
||||
/* return a device pointer linked to each sound device as a parent */
|
||||
static inline struct device *snd_card_get_device_link(struct snd_card *card)
|
||||
{
|
||||
#ifdef CONFIG_SYSFS_DEPRECATED
|
||||
return card ? card->dev : NULL;
|
||||
#else
|
||||
return card ? card->card_dev : NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* sound.c */
|
||||
|
||||
Reference in New Issue
Block a user