You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem
Commit 2d4ba4a3b9 introduced a dependency
that was never meant to exist when the ac97_bus.c module was created.
Move ac97_bus.c up the directory hierarchy to make sure it is built when
selected even if sound is configured out so things work as originally
intended.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
741441ab78
commit
e1036502e5
@@ -0,0 +1,72 @@
|
||||
/*
|
||||
* Linux driver model AC97 bus interface
|
||||
*
|
||||
* Author: Nicolas Pitre
|
||||
* Created: Jan 14, 2005
|
||||
* Copyright: (C) MontaVista Software Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/string.h>
|
||||
|
||||
/*
|
||||
* Let drivers decide whether they want to support given codec from their
|
||||
* probe method. Drivers have direct access to the struct snd_ac97 structure and may
|
||||
* decide based on the id field amongst other things.
|
||||
*/
|
||||
static int ac97_bus_match(struct device *dev, struct device_driver *drv)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int ac97_bus_suspend(struct device *dev, pm_message_t state)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
if (dev->driver && dev->driver->suspend)
|
||||
ret = dev->driver->suspend(dev, state);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ac97_bus_resume(struct device *dev)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
if (dev->driver && dev->driver->resume)
|
||||
ret = dev->driver->resume(dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct bus_type ac97_bus_type = {
|
||||
.name = "ac97",
|
||||
.match = ac97_bus_match,
|
||||
.suspend = ac97_bus_suspend,
|
||||
.resume = ac97_bus_resume,
|
||||
};
|
||||
|
||||
static int __init ac97_bus_init(void)
|
||||
{
|
||||
return bus_register(&ac97_bus_type);
|
||||
}
|
||||
|
||||
subsys_initcall(ac97_bus_init);
|
||||
|
||||
static void __exit ac97_bus_exit(void)
|
||||
{
|
||||
bus_unregister(&ac97_bus_type);
|
||||
}
|
||||
|
||||
module_exit(ac97_bus_exit);
|
||||
|
||||
EXPORT_SYMBOL(ac97_bus_type);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
Reference in New Issue
Block a user