Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2513eb8e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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-doc
parents d3745f46 cd6ef2ad

Documentation/feature-removal-schedule.txt

+0 −8
Original line number Diff line number Diff line
@@ -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

drivers/base/bus.c

+3 −2
Original line number Diff line number Diff line
@@ -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  */





/**

drivers/base/core.c

+15 −15
Original line number Diff line number Diff line
@@ -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)

{

include/linux/ioport.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/linux/pm_legacy.h

+0 −7
Original line number Diff line number Diff line
@@ -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;