You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Revert "[POWERPC] Rename get_property to of_get_property: drivers"
This reverts commit d05c7a80cf,
which included changes which should go via other subsystem
maintainers.
This commit is contained in:
@@ -297,7 +297,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
|
||||
/* Match it to a port node */
|
||||
index = (ap == ap->host->ports[0]) ? 0 : 1;
|
||||
for (np = np->child; np != NULL; np = np->sibling) {
|
||||
const u32 *reg = of_get_property(np, "reg", NULL);
|
||||
const u32 *reg = get_property(np, "reg", NULL);
|
||||
if (!reg)
|
||||
continue;
|
||||
if (index == *reg)
|
||||
|
||||
@@ -613,7 +613,7 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
|
||||
uninorth_node = of_find_node_by_name(NULL, "u3");
|
||||
}
|
||||
if (uninorth_node) {
|
||||
const int *revprop = of_get_property(uninorth_node,
|
||||
const int *revprop = get_property(uninorth_node,
|
||||
"device-rev", NULL);
|
||||
if (revprop != NULL)
|
||||
uninorth_rev = *revprop & 0x3f;
|
||||
|
||||
@@ -206,7 +206,7 @@ static int __init briq_panel_init(void)
|
||||
const char *machine;
|
||||
int i;
|
||||
|
||||
machine = of_get_property(root, "model", NULL);
|
||||
machine = get_property(root, "model", NULL);
|
||||
if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) {
|
||||
of_node_put(root);
|
||||
return -ENODEV;
|
||||
|
||||
@@ -575,7 +575,7 @@ static int hvc_find_vtys(void)
|
||||
(num_found >= VTTY_PORTS))
|
||||
break;
|
||||
|
||||
vtermno = of_get_property(vty, "reg", NULL);
|
||||
vtermno = get_property(vty, "reg", NULL);
|
||||
if (!vtermno)
|
||||
continue;
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@ static int hvc_find_vtys(void)
|
||||
if (num_found >= MAX_NR_HVC_CONSOLES)
|
||||
break;
|
||||
|
||||
vtermno = of_get_property(vty, "reg", NULL);
|
||||
vtermno = get_property(vty, "reg", NULL);
|
||||
if (!vtermno)
|
||||
continue;
|
||||
|
||||
|
||||
+2
-2
@@ -1279,8 +1279,8 @@ static int __init hvsi_console_init(void)
|
||||
struct hvsi_struct *hp;
|
||||
const uint32_t *vtermno, *irq;
|
||||
|
||||
vtermno = of_get_property(vty, "reg", NULL);
|
||||
irq = of_get_property(vty, "interrupts", NULL);
|
||||
vtermno = get_property(vty, "reg", NULL);
|
||||
irq = get_property(vty, "interrupts", NULL);
|
||||
if (!vtermno || !irq)
|
||||
continue;
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
reg = of_get_property(dn, "reg", ®len);
|
||||
reg = get_property(dn, "reg", ®len);
|
||||
naddrc = of_n_addr_cells(dn);
|
||||
nsizec = of_n_size_cells(dn);
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ int ams_sensor_attach(void)
|
||||
const u32 *prop;
|
||||
|
||||
/* Get orientation */
|
||||
prop = of_get_property(ams_info.of_node, "orientation", NULL);
|
||||
prop = get_property(ams_info.of_node, "orientation", NULL);
|
||||
if (!prop)
|
||||
return -ENODEV;
|
||||
ams_info.orient1 = *prop;
|
||||
|
||||
@@ -276,7 +276,7 @@ int __init ams_i2c_init(struct device_node *np)
|
||||
ams_info.bustype = BUS_I2C;
|
||||
|
||||
/* look for bus either using "reg" or by path */
|
||||
prop = of_get_property(ams_info.of_node, "reg", NULL);
|
||||
prop = get_property(ams_info.of_node, "reg", NULL);
|
||||
if (!prop) {
|
||||
result = -ENODEV;
|
||||
|
||||
|
||||
@@ -160,7 +160,7 @@ int __init ams_pmu_init(struct device_node *np)
|
||||
ams_info.bustype = BUS_HOST;
|
||||
|
||||
/* Get PMU command, should be 0x4e, but we can never know */
|
||||
prop = of_get_property(ams_info.of_node, "reg", NULL);
|
||||
prop = get_property(ams_info.of_node, "reg", NULL);
|
||||
if (!prop) {
|
||||
result = -ENODEV;
|
||||
goto exit;
|
||||
|
||||
@@ -1175,14 +1175,14 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
|
||||
pmif->broken_dma = 1;
|
||||
}
|
||||
|
||||
bidp = of_get_property(np, "AAPL,bus-id", NULL);
|
||||
bidp = get_property(np, "AAPL,bus-id", NULL);
|
||||
pmif->aapl_bus_id = bidp ? *bidp : 0;
|
||||
|
||||
/* Get cable type from device-tree */
|
||||
if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6
|
||||
|| pmif->kind == controller_k2_ata6
|
||||
|| pmif->kind == controller_sh_ata6) {
|
||||
const char* cable = of_get_property(np, "cable-type", NULL);
|
||||
const char* cable = get_property(np, "cable-type", NULL);
|
||||
if (cable && !strncmp(cable, "80-", 3))
|
||||
pmif->cable_80 = 1;
|
||||
}
|
||||
|
||||
@@ -569,7 +569,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
|
||||
struct ib_pd *ibpd;
|
||||
int ret;
|
||||
|
||||
handle = of_get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
|
||||
handle = get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
|
||||
if (!handle) {
|
||||
ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
|
||||
dev->ofdev.node->full_name);
|
||||
|
||||
@@ -395,7 +395,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
|
||||
#endif
|
||||
MAX_NODE_NAME_SIZE, np->name);
|
||||
} else {
|
||||
reg = of_get_property(np, "reg", NULL);
|
||||
reg = get_property(np, "reg", NULL);
|
||||
sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",
|
||||
chip->lbus.index,
|
||||
reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);
|
||||
|
||||
@@ -21,7 +21,7 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
int length = 0;
|
||||
|
||||
of = &to_macio_device (dev)->ofdev;
|
||||
compat = of_get_property(of->node, "compatible", &cplen);
|
||||
compat = get_property(of->node, "compatible", &cplen);
|
||||
if (!compat) {
|
||||
*buf = '\0';
|
||||
return 0;
|
||||
@@ -47,7 +47,7 @@ static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
|
||||
int length;
|
||||
|
||||
of = &to_macio_device (dev)->ofdev;
|
||||
compat = of_get_property(of->node, "compatible", &cplen);
|
||||
compat = get_property(of->node, "compatible", &cplen);
|
||||
if (!compat) compat = "", cplen = 1;
|
||||
length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
|
||||
buf += length;
|
||||
|
||||
@@ -387,7 +387,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,
|
||||
if (strcmp(np->name, "lightshow") == 0)
|
||||
break;
|
||||
if ((strcmp(np->name, "sound") == 0) &&
|
||||
of_get_property(np, "virtual", NULL) != NULL)
|
||||
get_property(np, "virtual", NULL) != NULL)
|
||||
break;
|
||||
}
|
||||
if (np == NULL) {
|
||||
|
||||
@@ -491,7 +491,7 @@ int __init smu_init (void)
|
||||
printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
|
||||
goto fail;
|
||||
}
|
||||
data = of_get_property(smu->db_node, "reg", NULL);
|
||||
data = get_property(smu->db_node, "reg", NULL);
|
||||
if (data == NULL) {
|
||||
of_node_put(smu->db_node);
|
||||
smu->db_node = NULL;
|
||||
@@ -512,7 +512,7 @@ int __init smu_init (void)
|
||||
smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt");
|
||||
if (smu->msg_node == NULL)
|
||||
break;
|
||||
data = of_get_property(smu->msg_node, "reg", NULL);
|
||||
data = get_property(smu->msg_node, "reg", NULL);
|
||||
if (data == NULL) {
|
||||
of_node_put(smu->msg_node);
|
||||
smu->msg_node = NULL;
|
||||
@@ -1004,7 +1004,7 @@ const struct smu_sdbp_header *__smu_get_sdb_partition(int id,
|
||||
} else
|
||||
mutex_lock(&smu_part_access);
|
||||
|
||||
part = of_get_property(smu->of_node, pname, size);
|
||||
part = get_property(smu->of_node, pname, size);
|
||||
if (part == NULL) {
|
||||
DPRINTK("trying to extract from SMU ...\n");
|
||||
part = smu_create_sdb_partition(id);
|
||||
|
||||
@@ -567,13 +567,13 @@ thermostat_init(void)
|
||||
else
|
||||
return -ENODEV;
|
||||
|
||||
prop = of_get_property(np, "hwsensor-params-version", NULL);
|
||||
prop = get_property(np, "hwsensor-params-version", NULL);
|
||||
printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop,
|
||||
(*prop == 1)?"":"un");
|
||||
if (*prop != 1)
|
||||
return -ENODEV;
|
||||
|
||||
prop = of_get_property(np, "reg", NULL);
|
||||
prop = get_property(np, "reg", NULL);
|
||||
if (!prop)
|
||||
return -ENODEV;
|
||||
|
||||
@@ -591,9 +591,9 @@ thermostat_init(void)
|
||||
"limit_adjust: %d, fan_speed: %d\n",
|
||||
therm_bus, therm_address, limit_adjust, fan_speed);
|
||||
|
||||
if (of_get_property(np, "hwsensor-location", NULL)) {
|
||||
if (get_property(np, "hwsensor-location", NULL)) {
|
||||
for (i = 0; i < 3; i++) {
|
||||
sensor_location[i] = of_get_property(np,
|
||||
sensor_location[i] = get_property(np,
|
||||
"hwsensor-location", NULL) + offset;
|
||||
|
||||
if (sensor_location[i] == NULL)
|
||||
|
||||
@@ -674,7 +674,7 @@ static int read_eeprom(int cpu, struct mpu_data *out)
|
||||
printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
data = of_get_property(np, "cpuid", &len);
|
||||
data = get_property(np, "cpuid", &len);
|
||||
if (data == NULL) {
|
||||
printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n");
|
||||
of_node_put(np);
|
||||
@@ -1337,7 +1337,7 @@ static int init_backside_state(struct backside_pid_state *state)
|
||||
*/
|
||||
u3 = of_find_node_by_path("/u3@0,f8000000");
|
||||
if (u3 != NULL) {
|
||||
const u32 *vers = of_get_property(u3, "device-rev", NULL);
|
||||
const u32 *vers = get_property(u3, "device-rev", NULL);
|
||||
if (vers)
|
||||
if (((*vers) & 0x3f) < 0x34)
|
||||
u3h = 0;
|
||||
@@ -2129,8 +2129,8 @@ static void fcu_lookup_fans(struct device_node *fcu_node)
|
||||
continue;
|
||||
|
||||
/* Lookup for a matching location */
|
||||
loc = of_get_property(np, "location", NULL);
|
||||
reg = of_get_property(np, "reg", NULL);
|
||||
loc = get_property(np, "location", NULL);
|
||||
reg = get_property(np, "reg", NULL);
|
||||
if (loc == NULL || reg == NULL)
|
||||
continue;
|
||||
DBG(" matching location: %s, reg: 0x%08x\n", loc, *reg);
|
||||
|
||||
@@ -492,7 +492,7 @@ g4fan_init( void )
|
||||
|
||||
if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
|
||||
return -ENODEV;
|
||||
info = of_get_property(np, "thermal-info", NULL);
|
||||
info = get_property(np, "thermal-info", NULL);
|
||||
of_node_put(np);
|
||||
|
||||
if( !info || !machine_is_compatible("PowerMac3,6") )
|
||||
|
||||
@@ -131,7 +131,7 @@ int __init find_via_cuda(void)
|
||||
if (vias == 0)
|
||||
return 0;
|
||||
|
||||
reg = of_get_property(vias, "reg", NULL);
|
||||
reg = get_property(vias, "reg", NULL);
|
||||
if (reg == NULL) {
|
||||
printk(KERN_ERR "via-cuda: No \"reg\" property !\n");
|
||||
goto fail;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user