mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04: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:
parent
0999ed7f57
commit
a48141db68
50 changed files with 120 additions and 122 deletions
|
|
@ -1069,7 +1069,7 @@ mpc52xx_uart_of_enumerate(void)
|
|||
continue;
|
||||
|
||||
/* Is a particular device number requested? */
|
||||
devno = of_get_property(np, "port-number", NULL);
|
||||
devno = get_property(np, "port-number", NULL);
|
||||
mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
|
|||
int ret;
|
||||
|
||||
memset(port, 0, sizeof *port);
|
||||
spd = of_get_property(np, "current-speed", NULL);
|
||||
clk = of_get_property(np, "clock-frequency", NULL);
|
||||
spd = get_property(np, "current-speed", NULL);
|
||||
clk = get_property(np, "clock-frequency", NULL);
|
||||
if (!clk) {
|
||||
dev_warn(&ofdev->dev, "no clock-frequency property set\n");
|
||||
return -ENODEV;
|
||||
|
|
|
|||
|
|
@ -1452,12 +1452,12 @@ no_dma:
|
|||
*/
|
||||
if (device_is_compatible(np, "cobalt"))
|
||||
uap->flags |= PMACZILOG_FLAG_IS_INTMODEM;
|
||||
conn = of_get_property(np, "AAPL,connector", &len);
|
||||
conn = get_property(np, "AAPL,connector", &len);
|
||||
if (conn && (strcmp(conn, "infrared") == 0))
|
||||
uap->flags |= PMACZILOG_FLAG_IS_IRDA;
|
||||
uap->port_type = PMAC_SCC_ASYNC;
|
||||
/* 1999 Powerbook G3 has slot-names property instead */
|
||||
slots = of_get_property(np, "slot-names", &len);
|
||||
slots = get_property(np, "slot-names", &len);
|
||||
if (slots && slots->count > 0) {
|
||||
if (strcmp(slots->name, "IrDA") == 0)
|
||||
uap->flags |= PMACZILOG_FLAG_IS_IRDA;
|
||||
|
|
@ -1471,7 +1471,7 @@ no_dma:
|
|||
of_find_node_by_name(NULL, "i2c-modem");
|
||||
if (i2c_modem) {
|
||||
const char* mid =
|
||||
of_get_property(i2c_modem, "modem-id", NULL);
|
||||
get_property(i2c_modem, "modem-id", NULL);
|
||||
if (mid) switch(*mid) {
|
||||
case 0x04 :
|
||||
case 0x05 :
|
||||
|
|
|
|||
Loading…
Reference in a new issue