Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 106970
b: refs/heads/master
c: 7f71ac9
h: refs/heads/master
v: v3
  • Loading branch information
Ben Dooks authored and Samuel Ortiz committed Jul 28, 2008
1 parent 992898a commit 656d5fe
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 18 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: 96ee41993b5b25ee0fbde2d4dcaac1f8c5ef5cc4
refs/heads/master: 7f71ac9374fec066e428892a68db158946cee1fb
15 changes: 7 additions & 8 deletions trunk/drivers/mfd/mfd-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include <linux/mfd/core.h>

static int mfd_add_device(struct platform_device *parent,
const struct mfd_cell *cell,
struct resource *mem_base,
int irq_base)
const struct mfd_cell *cell,
struct resource *mem_base,
int irq_base)
{
struct resource res[cell->num_resources];
struct platform_device *pdev;
Expand Down Expand Up @@ -75,11 +75,10 @@ static int mfd_add_device(struct platform_device *parent,
return ret;
}

int mfd_add_devices(
struct platform_device *parent,
const struct mfd_cell *cells, int n_devs,
struct resource *mem_base,
int irq_base)
int mfd_add_devices(struct platform_device *parent,
const struct mfd_cell *cells, int n_devs,
struct resource *mem_base,
int irq_base)
{
int i;
int ret = 0;
Expand Down
17 changes: 8 additions & 9 deletions trunk/include/linux/mfd/core.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#ifndef MFD_CORE_H
#define MFD_CORE_H
/*
* drivers/mfd/mfd-core.h
*
Expand All @@ -13,6 +11,9 @@
*
*/

#ifndef MFD_CORE_H
#define MFD_CORE_H

#include <linux/platform_device.h>

/*
Expand All @@ -38,17 +39,15 @@ struct mfd_cell {
const struct resource *resources;
};

static inline struct mfd_cell *
mfd_get_cell(struct platform_device *pdev)
static inline struct mfd_cell *mfd_get_cell(struct platform_device *pdev)
{
return (struct mfd_cell *)pdev->dev.platform_data;
}

extern int mfd_add_devices(
struct platform_device *parent,
const struct mfd_cell *cells, int n_devs,
struct resource *mem_base,
int irq_base);
extern int mfd_add_devices(struct platform_device *parent,
const struct mfd_cell *cells, int n_devs,
struct resource *mem_base,
int irq_base);

extern void mfd_remove_devices(struct platform_device *parent);

Expand Down

0 comments on commit 656d5fe

Please sign in to comment.