Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 151237
b: refs/heads/master
c: c0afe7b
h: refs/heads/master
i:
  151235: e3698c4
v: v3
  • Loading branch information
Linus Walleij authored and Greg Kroah-Hartman committed Jun 16, 2009
1 parent f27d0bb commit 204f962
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 309b7d60a345f402bec3cf9caadb53de4028e2aa
refs/heads/master: c0afe7ba5e71d8ab66bc42f90b3e237581d3c509
5 changes: 3 additions & 2 deletions trunk/drivers/base/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ EXPORT_SYMBOL_GPL(platform_get_irq);
* @name: resource name
*/
struct resource *platform_get_resource_byname(struct platform_device *dev,
unsigned int type, char *name)
unsigned int type,
const char *name)
{
int i;

Expand All @@ -88,7 +89,7 @@ EXPORT_SYMBOL_GPL(platform_get_resource_byname);
* @dev: platform device
* @name: IRQ name
*/
int platform_get_irq_byname(struct platform_device *dev, char *name)
int platform_get_irq_byname(struct platform_device *dev, const char *name)
{
struct resource *r = platform_get_resource_byname(dev, IORESOURCE_IRQ,
name);
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/linux/platform_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ extern struct device platform_bus;

extern struct resource *platform_get_resource(struct platform_device *, unsigned int, unsigned int);
extern int platform_get_irq(struct platform_device *, unsigned int);
extern struct resource *platform_get_resource_byname(struct platform_device *, unsigned int, char *);
extern int platform_get_irq_byname(struct platform_device *, char *);
extern struct resource *platform_get_resource_byname(struct platform_device *, unsigned int, const char *);
extern int platform_get_irq_byname(struct platform_device *, const char *);
extern int platform_add_devices(struct platform_device **, int);

extern struct platform_device *platform_device_register_simple(const char *, int id,
Expand Down

0 comments on commit 204f962

Please sign in to comment.