Skip to content

Commit

Permalink
of/device: Replace of_device with platform_device in includes and cor…
Browse files Browse the repository at this point in the history 
…e code

of_device is currently just an #define alias to platform_device until it
gets removed entirely.  This patch removes references to it from the
include directories and the core drivers/of code.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Grant Likely committed Jul 24, 2010
1 parent c1b6d38 commit 94a0cb1
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/macio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct macio_dev
{
struct macio_bus *bus; /* macio bus this device is on */
struct macio_dev *media_bay; /* Device is part of a media bay */
struct of_device ofdev;
struct platform_device ofdev;
struct device_dma_parameters dma_parms; /* ide needs that */
int n_resources;
struct resource resource[MACIO_DEV_COUNT_RESOURCES];
Expand Down
6 changes: 3 additions & 3 deletions arch/sparc/include/asm/floppy_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct sun_flpy_controller {
/* You'll only ever find one controller on an Ultra anyways. */
static struct sun_flpy_controller *sun_fdc = (struct sun_flpy_controller *)-1;
unsigned long fdc_status;
static struct of_device *floppy_op = NULL;
static struct platform_device *floppy_op = NULL;

struct sun_floppy_ops {
unsigned char (*fd_inb) (unsigned long port);
Expand Down Expand Up @@ -548,7 +548,7 @@ static unsigned long __init sun_floppy_init(void)
{
static int initialized = 0;
struct device_node *dp;
struct of_device *op;
struct platform_device *op;
const char *prop;
char state[128];

Expand Down Expand Up @@ -661,7 +661,7 @@ static unsigned long __init sun_floppy_init(void)
config = 0;
for (dp = ebus_dp->child; dp; dp = dp->sibling) {
if (!strcmp(dp->name, "ecpp")) {
struct of_device *ecpp_op;
struct platform_device *ecpp_op;

ecpp_op = of_find_device_by_node(dp);
if (ecpp_op)
Expand Down
4 changes: 2 additions & 2 deletions arch/sparc/include/asm/parport.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static inline unsigned int get_dma_residue(unsigned int dmanr)
return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info);
}

static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id *match)
static int __devinit ecpp_probe(struct platform_device *op, const struct of_device_id *match)
{
unsigned long base = op->resource[0].start;
unsigned long config = op->resource[1].start;
Expand Down Expand Up @@ -192,7 +192,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
return err;
}

static int __devexit ecpp_remove(struct of_device *op)
static int __devexit ecpp_remove(struct platform_device *op)
{
struct parport *p = dev_get_drvdata(&op->dev);
int slot = p->dma;
Expand Down
22 changes: 11 additions & 11 deletions drivers/of/device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ const struct of_device_id *of_match_device(const struct of_device_id *matches,
}
EXPORT_SYMBOL(of_match_device);

struct of_device *of_dev_get(struct of_device *dev)
struct platform_device *of_dev_get(struct platform_device *dev)
{
struct device *tmp;

if (!dev)
return NULL;
tmp = get_device(&dev->dev);
if (tmp)
return to_of_device(tmp);
return to_platform_device(tmp);
else
return NULL;
}
EXPORT_SYMBOL(of_dev_get);

void of_dev_put(struct of_device *dev)
void of_dev_put(struct platform_device *dev)
{
if (dev)
put_device(&dev->dev);
Expand All @@ -50,18 +50,18 @@ EXPORT_SYMBOL(of_dev_put);
static ssize_t devspec_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct of_device *ofdev;
struct platform_device *ofdev;

ofdev = to_of_device(dev);
ofdev = to_platform_device(dev);
return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
}

static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct of_device *ofdev;
struct platform_device *ofdev;

ofdev = to_of_device(dev);
ofdev = to_platform_device(dev);
return sprintf(buf, "%s\n", ofdev->dev.of_node->name);
}

Expand Down Expand Up @@ -90,15 +90,15 @@ struct device_attribute of_platform_device_attrs[] = {
*/
void of_release_dev(struct device *dev)
{
struct of_device *ofdev;
struct platform_device *ofdev;

ofdev = to_of_device(dev);
ofdev = to_platform_device(dev);
of_node_put(ofdev->dev.of_node);
kfree(ofdev);
}
EXPORT_SYMBOL(of_release_dev);

int of_device_register(struct of_device *ofdev)
int of_device_register(struct platform_device *ofdev)
{
BUG_ON(ofdev->dev.of_node == NULL);

Expand All @@ -119,7 +119,7 @@ int of_device_register(struct of_device *ofdev)
}
EXPORT_SYMBOL(of_device_register);

void of_device_unregister(struct of_device *ofdev)
void of_device_unregister(struct platform_device *ofdev)
{
device_unregister(&ofdev->dev);
}
Expand Down
24 changes: 12 additions & 12 deletions drivers/of/platform.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ static int of_platform_device_probe(struct device *dev)
{
int error = -ENODEV;
struct of_platform_driver *drv;
struct of_device *of_dev;
struct platform_device *of_dev;
const struct of_device_id *match;

drv = to_of_platform_driver(dev->driver);
of_dev = to_of_device(dev);
of_dev = to_platform_device(dev);

if (!drv->probe)
return error;
Expand All @@ -116,7 +116,7 @@ static int of_platform_device_probe(struct device *dev)

static int of_platform_device_remove(struct device *dev)
{
struct of_device *of_dev = to_of_device(dev);
struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver);

if (dev->driver && drv->remove)
Expand All @@ -126,7 +126,7 @@ static int of_platform_device_remove(struct device *dev)

static void of_platform_device_shutdown(struct device *dev)
{
struct of_device *of_dev = to_of_device(dev);
struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver);

if (dev->driver && drv->shutdown)
Expand All @@ -137,7 +137,7 @@ static void of_platform_device_shutdown(struct device *dev)

static int of_platform_legacy_suspend(struct device *dev, pm_message_t mesg)
{
struct of_device *of_dev = to_of_device(dev);
struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
int ret = 0;

Expand All @@ -148,7 +148,7 @@ static int of_platform_legacy_suspend(struct device *dev, pm_message_t mesg)

static int of_platform_legacy_resume(struct device *dev)
{
struct of_device *of_dev = to_of_device(dev);
struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
int ret = 0;

Expand Down Expand Up @@ -543,11 +543,11 @@ static void of_device_make_bus_id(struct device *dev)
* @bus_id: Name to assign to the device. May be null to use default name.
* @parent: Parent device.
*/
struct of_device *of_device_alloc(struct device_node *np,
struct platform_device *of_device_alloc(struct device_node *np,
const char *bus_id,
struct device *parent)
{
struct of_device *dev;
struct platform_device *dev;
int rc, i, num_reg = 0, num_irq = 0;
struct resource *res, temp_res;

Expand Down Expand Up @@ -600,11 +600,11 @@ EXPORT_SYMBOL(of_device_alloc);
* @bus_id: name to assign device
* @parent: Linux device model parent device.
*/
struct of_device *of_platform_device_create(struct device_node *np,
struct platform_device *of_platform_device_create(struct device_node *np,
const char *bus_id,
struct device *parent)
{
struct of_device *dev;
struct platform_device *dev;

dev = of_device_alloc(np, bus_id, parent);
if (!dev)
Expand Down Expand Up @@ -642,7 +642,7 @@ static int of_platform_bus_create(const struct device_node *bus,
struct device *parent)
{
struct device_node *child;
struct of_device *dev;
struct platform_device *dev;
int rc = 0;

for_each_child_of_node(bus, child) {
Expand Down Expand Up @@ -678,7 +678,7 @@ int of_platform_bus_probe(struct device_node *root,
struct device *parent)
{
struct device_node *child;
struct of_device *dev;
struct platform_device *dev;
int rc = 0;

if (matches == NULL)
Expand Down
10 changes: 5 additions & 5 deletions include/linux/of_device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ static inline int of_driver_match_device(const struct device *dev,
return of_match_device(drv->of_match_table, dev) != NULL;
}

extern struct of_device *of_dev_get(struct of_device *dev);
extern void of_dev_put(struct of_device *dev);
extern struct platform_device *of_dev_get(struct platform_device *dev);
extern void of_dev_put(struct platform_device *dev);

extern int of_device_register(struct of_device *ofdev);
extern void of_device_unregister(struct of_device *ofdev);
extern int of_device_register(struct platform_device *ofdev);
extern void of_device_unregister(struct platform_device *ofdev);
extern void of_release_dev(struct device *dev);

static inline void of_device_free(struct of_device *dev)
static inline void of_device_free(struct platform_device *dev)
{
of_release_dev(&dev->dev);
}
Expand Down
16 changes: 8 additions & 8 deletions include/linux/of_platform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ extern const struct of_device_id of_default_bus_ids[];
*/
struct of_platform_driver
{
int (*probe)(struct of_device* dev,
int (*probe)(struct platform_device* dev,
const struct of_device_id *match);
int (*remove)(struct of_device* dev);
int (*remove)(struct platform_device* dev);

int (*suspend)(struct of_device* dev, pm_message_t state);
int (*resume)(struct of_device* dev);
int (*shutdown)(struct of_device* dev);
int (*suspend)(struct platform_device* dev, pm_message_t state);
int (*resume)(struct platform_device* dev);
int (*shutdown)(struct platform_device* dev);

struct device_driver driver;
struct platform_driver platform_driver;
Expand All @@ -49,16 +49,16 @@ extern void of_unregister_driver(struct of_platform_driver *drv);
extern int of_register_platform_driver(struct of_platform_driver *drv);
extern void of_unregister_platform_driver(struct of_platform_driver *drv);

extern struct of_device *of_device_alloc(struct device_node *np,
extern struct platform_device *of_device_alloc(struct device_node *np,
const char *bus_id,
struct device *parent);
extern struct of_device *of_find_device_by_node(struct device_node *np);
extern struct platform_device *of_find_device_by_node(struct device_node *np);

extern int of_bus_type_init(struct bus_type *bus, const char *name);

#if !defined(CONFIG_SPARC) /* SPARC has its own device registration method */
/* Platform devices and busses creation */
extern struct of_device *of_platform_device_create(struct device_node *np,
extern struct platform_device *of_platform_device_create(struct device_node *np,
const char *bus_id,
struct device *parent);

Expand Down

0 comments on commit 94a0cb1

Please sign in to comment.