mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
of: Always use 'struct device.of_node' to get device node pointer.
The following structure elements duplicate the information in 'struct device.of_node' and so are being eliminated. This patch makes all readers of these elements use device.of_node instead. (struct of_device *)->node (struct dev_archdata *)->prom_node (sparc) (struct dev_archdata *)->of_node (powerpc & microblaze) Signed-off-by: Grant Likely <[email protected]>
This commit is contained in:
parent
d12d42f744
commit
61c7a080a5
157 changed files with 497 additions and 488 deletions
|
|
@ -740,7 +740,7 @@ static void cg6_unmap_regs(struct of_device *op, struct fb_info *info,
|
|||
static int __devinit cg6_probe(struct of_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *dp = op->node;
|
||||
struct device_node *dp = op->dev.of_node;
|
||||
struct fb_info *info;
|
||||
struct cg6_par *par;
|
||||
int linebytes, err;
|
||||
|
|
|
|||
|
|
@ -896,7 +896,7 @@ static void ffb_init_fix(struct fb_info *info)
|
|||
static int __devinit ffb_probe(struct of_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *dp = op->node;
|
||||
struct device_node *dp = op->dev.of_node;
|
||||
struct ffb_fbc __iomem *fbc;
|
||||
struct ffb_dac __iomem *dac;
|
||||
struct fb_info *info;
|
||||
|
|
|
|||
|
|
@ -1421,7 +1421,7 @@ static ssize_t show_monitor(struct device *device,
|
|||
static int __devinit fsl_diu_probe(struct of_device *ofdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *np = ofdev->node;
|
||||
struct device_node *np = ofdev->dev.of_node;
|
||||
struct mfb_info *mfbi;
|
||||
phys_addr_t dummy_ad_addr;
|
||||
int ret, i, error = 0;
|
||||
|
|
|
|||
|
|
@ -536,7 +536,7 @@ static int __init platinumfb_setup(char *options)
|
|||
static int __devinit platinumfb_probe(struct of_device* odev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *dp = odev->node;
|
||||
struct device_node *dp = odev->dev.of_node;
|
||||
struct fb_info *info;
|
||||
struct fb_info_platinum *pinfo;
|
||||
volatile __u8 *fbuffer;
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ static int __devinit gfb_set_fbinfo(struct gfb_info *gp)
|
|||
static int __devinit gfb_probe(struct of_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *dp = op->node;
|
||||
struct device_node *dp = op->dev.of_node;
|
||||
struct fb_info *info;
|
||||
struct gfb_info *gp;
|
||||
int err;
|
||||
|
|
|
|||
|
|
@ -423,7 +423,7 @@ xilinxfb_of_probe(struct of_device *op, const struct of_device_id *match)
|
|||
* To check whether the core is connected directly to DCR or PLB
|
||||
* interface and initialize the tft_access accordingly.
|
||||
*/
|
||||
p = (u32 *)of_get_property(op->node, "xlnx,dcr-splb-slave-if", NULL);
|
||||
p = (u32 *)of_get_property(op->dev.of_node, "xlnx,dcr-splb-slave-if", NULL);
|
||||
tft_access = p ? *p : 0;
|
||||
|
||||
/*
|
||||
|
|
@ -432,41 +432,41 @@ xilinxfb_of_probe(struct of_device *op, const struct of_device_id *match)
|
|||
*/
|
||||
if (tft_access) {
|
||||
drvdata->flags |= PLB_ACCESS_FLAG;
|
||||
rc = of_address_to_resource(op->node, 0, &res);
|
||||
rc = of_address_to_resource(op->dev.of_node, 0, &res);
|
||||
if (rc) {
|
||||
dev_err(&op->dev, "invalid address\n");
|
||||
goto err;
|
||||
}
|
||||
} else {
|
||||
res.start = 0;
|
||||
start = dcr_resource_start(op->node, 0);
|
||||
drvdata->dcr_len = dcr_resource_len(op->node, 0);
|
||||
drvdata->dcr_host = dcr_map(op->node, start, drvdata->dcr_len);
|
||||
start = dcr_resource_start(op->dev.of_node, 0);
|
||||
drvdata->dcr_len = dcr_resource_len(op->dev.of_node, 0);
|
||||
drvdata->dcr_host = dcr_map(op->dev.of_node, start, drvdata->dcr_len);
|
||||
if (!DCR_MAP_OK(drvdata->dcr_host)) {
|
||||
dev_err(&op->dev, "invalid DCR address\n");
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
||||
prop = of_get_property(op->node, "phys-size", &size);
|
||||
prop = of_get_property(op->dev.of_node, "phys-size", &size);
|
||||
if ((prop) && (size >= sizeof(u32)*2)) {
|
||||
pdata.screen_width_mm = prop[0];
|
||||
pdata.screen_height_mm = prop[1];
|
||||
}
|
||||
|
||||
prop = of_get_property(op->node, "resolution", &size);
|
||||
prop = of_get_property(op->dev.of_node, "resolution", &size);
|
||||
if ((prop) && (size >= sizeof(u32)*2)) {
|
||||
pdata.xres = prop[0];
|
||||
pdata.yres = prop[1];
|
||||
}
|
||||
|
||||
prop = of_get_property(op->node, "virtual-resolution", &size);
|
||||
prop = of_get_property(op->dev.of_node, "virtual-resolution", &size);
|
||||
if ((prop) && (size >= sizeof(u32)*2)) {
|
||||
pdata.xvirt = prop[0];
|
||||
pdata.yvirt = prop[1];
|
||||
}
|
||||
|
||||
if (of_find_property(op->node, "rotate-display", NULL))
|
||||
if (of_find_property(op->dev.of_node, "rotate-display", NULL))
|
||||
pdata.rotate_screen = 1;
|
||||
|
||||
dev_set_drvdata(&op->dev, drvdata);
|
||||
|
|
|
|||
Loading…
Reference in a new issue