Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 of HEAD
* HEAD: [PATCH] The scheduled unexport of insert_resource [PATCH] remove kernel/power/pm.c:pm_unregister_all() [PATCH] Driver core: bus.c cleanups [PATCH] Driver core: kernel-doc in drivers/base/core.c corrections [PATCH] Driver core: fix driver-core kernel-dochifive-unleashed-5.1
Linus Torvalds
commit
2513eb8e67
|
|
@ -55,14 +55,6 @@ Who: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
|
|||
|
||||
---------------------------
|
||||
|
||||
What: remove EXPORT_SYMBOL(insert_resource)
|
||||
When: April 2006
|
||||
Files: kernel/resource.c
|
||||
Why: No modular usage in the kernel.
|
||||
Who: Adrian Bunk <bunk@stusta.de>
|
||||
|
||||
---------------------------
|
||||
|
||||
What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
|
||||
When: November 2005
|
||||
Files: drivers/pcmcia/: pcmcia_ioctl.c
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ static struct kobj_type ktype_bus = {
|
|||
|
||||
};
|
||||
|
||||
decl_subsys(bus, &ktype_bus, NULL);
|
||||
static decl_subsys(bus, &ktype_bus, NULL);
|
||||
|
||||
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
|
|
@ -598,12 +598,13 @@ void put_bus(struct bus_type * bus)
|
|||
*
|
||||
* Note that kset_find_obj increments bus' reference count.
|
||||
*/
|
||||
|
||||
#if 0
|
||||
struct bus_type * find_bus(char * name)
|
||||
{
|
||||
struct kobject * k = kset_find_obj(&bus_subsys.kset, name);
|
||||
return k ? to_bus(k) : NULL;
|
||||
}
|
||||
#endif /* 0 */
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -559,20 +559,20 @@ static void device_create_release(struct device *dev)
|
|||
|
||||
/**
|
||||
* device_create - creates a device and registers it with sysfs
|
||||
* @cs: pointer to the struct class that this device should be registered to.
|
||||
* @parent: pointer to the parent struct device of this new device, if any.
|
||||
* @dev: the dev_t for the char device to be added.
|
||||
* @fmt: string for the class device's name
|
||||
* @class: pointer to the struct class that this device should be registered to
|
||||
* @parent: pointer to the parent struct device of this new device, if any
|
||||
* @devt: the dev_t for the char device to be added
|
||||
* @fmt: string for the device's name
|
||||
*
|
||||
* This function can be used by char device classes. A struct device
|
||||
* will be created in sysfs, registered to the specified class.
|
||||
*
|
||||
* This function can be used by char device classes. A struct
|
||||
* device will be created in sysfs, registered to the specified
|
||||
* class.
|
||||
* A "dev" file will be created, showing the dev_t for the device, if
|
||||
* the dev_t is not 0,0.
|
||||
* If a pointer to a parent struct device is passed in, the newly
|
||||
* created struct device will be a child of that device in sysfs. The
|
||||
* pointer to the struct device will be returned from the call. Any
|
||||
* further sysfs files that might be required can be created using this
|
||||
* If a pointer to a parent struct device is passed in, the newly created
|
||||
* struct device will be a child of that device in sysfs.
|
||||
* The pointer to the struct device will be returned from the call.
|
||||
* Any further sysfs files that might be required can be created using this
|
||||
* pointer.
|
||||
*
|
||||
* Note: the struct class passed to this function must have previously
|
||||
|
|
@ -620,11 +620,11 @@ EXPORT_SYMBOL_GPL(device_create);
|
|||
|
||||
/**
|
||||
* device_destroy - removes a device that was created with device_create()
|
||||
* @class: the pointer to the struct class that this device was registered * with.
|
||||
* @dev: the dev_t of the device that was previously registered.
|
||||
* @class: pointer to the struct class that this device was registered with
|
||||
* @devt: the dev_t of the device that was previously registered
|
||||
*
|
||||
* This call unregisters and cleans up a class device that was created with a
|
||||
* call to class_device_create()
|
||||
* This call unregisters and cleans up a device that was created with a
|
||||
* call to device_create().
|
||||
*/
|
||||
void device_destroy(struct class *class, dev_t devt)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ extern struct resource iomem_resource;
|
|||
extern int request_resource(struct resource *root, struct resource *new);
|
||||
extern struct resource * ____request_resource(struct resource *root, struct resource *new);
|
||||
extern int release_resource(struct resource *new);
|
||||
extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new);
|
||||
extern int insert_resource(struct resource *parent, struct resource *new);
|
||||
extern int allocate_resource(struct resource *root, struct resource *new,
|
||||
resource_size_t size, resource_size_t min,
|
||||
resource_size_t max, resource_size_t align,
|
||||
|
|
|
|||
|
|
@ -14,11 +14,6 @@ extern int pm_active;
|
|||
struct pm_dev __deprecated *
|
||||
pm_register(pm_dev_t type, unsigned long id, pm_callback callback);
|
||||
|
||||
/*
|
||||
* Unregister all devices with matching callback
|
||||
*/
|
||||
void __deprecated pm_unregister_all(pm_callback callback);
|
||||
|
||||
/*
|
||||
* Send a request to all devices
|
||||
*/
|
||||
|
|
@ -35,8 +30,6 @@ static inline struct pm_dev *pm_register(pm_dev_t type,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static inline void pm_unregister_all(pm_callback callback) {}
|
||||
|
||||
static inline int pm_send_all(pm_request_t rqst, void *data)
|
||||
{
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -75,42 +75,6 @@ struct pm_dev *pm_register(pm_dev_t type,
|
|||
return dev;
|
||||
}
|
||||
|
||||
static void __pm_unregister(struct pm_dev *dev)
|
||||
{
|
||||
if (dev) {
|
||||
list_del(&dev->entry);
|
||||
kfree(dev);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* pm_unregister_all - unregister all devices with matching callback
|
||||
* @callback: callback function pointer
|
||||
*
|
||||
* Unregister every device that would call the callback passed. This
|
||||
* is primarily meant as a helper function for loadable modules. It
|
||||
* enables a module to give up all its managed devices without keeping
|
||||
* its own private list.
|
||||
*/
|
||||
|
||||
void pm_unregister_all(pm_callback callback)
|
||||
{
|
||||
struct list_head *entry;
|
||||
|
||||
if (!callback)
|
||||
return;
|
||||
|
||||
mutex_lock(&pm_devs_lock);
|
||||
entry = pm_devs.next;
|
||||
while (entry != &pm_devs) {
|
||||
struct pm_dev *dev = list_entry(entry, struct pm_dev, entry);
|
||||
entry = entry->next;
|
||||
if (dev->callback == callback)
|
||||
__pm_unregister(dev);
|
||||
}
|
||||
mutex_unlock(&pm_devs_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
* pm_send - send request to a single device
|
||||
* @dev: device to send to
|
||||
|
|
@ -239,7 +203,6 @@ int pm_send_all(pm_request_t rqst, void *data)
|
|||
}
|
||||
|
||||
EXPORT_SYMBOL(pm_register);
|
||||
EXPORT_SYMBOL(pm_unregister_all);
|
||||
EXPORT_SYMBOL(pm_send_all);
|
||||
EXPORT_SYMBOL(pm_active);
|
||||
|
||||
|
|
|
|||
|
|
@ -404,8 +404,6 @@ int insert_resource(struct resource *parent, struct resource *new)
|
|||
return result;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(insert_resource);
|
||||
|
||||
/*
|
||||
* Given an existing resource, change its start and size to match the
|
||||
* arguments. Returns -EBUSY if it can't fit. Existing children of
|
||||
|
|
|
|||
Loading…
Reference in New Issue