From fe9cfcefedd34857f2b693dffd2ef0f08c13afcd Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Fri, 11 Jan 2013 01:05:48 +0100 Subject: [PATCH] --- yaml --- r: 350777 b: refs/heads/master c: 9d15a3bac39e0a7945c463c26fd25c1c58280c68 h: refs/heads/master i: 350775: 296046cbd7482da3e3f784ef41c05da721406167 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-mpc512x-psc.c | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index c5d63d1a6167..14c1563bbbeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2deff8d602e8c9a2cab4b070be829294e1211f2c +refs/heads/master: 9d15a3bac39e0a7945c463c26fd25c1c58280c68 diff --git a/trunk/drivers/spi/spi-mpc512x-psc.c b/trunk/drivers/spi/spi-mpc512x-psc.c index cb3a3106bd4f..88e544151f6f 100644 --- a/trunk/drivers/spi/spi-mpc512x-psc.c +++ b/trunk/drivers/spi/spi-mpc512x-psc.c @@ -522,17 +522,11 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *op) regaddr64 = of_translate_address(op->dev.of_node, regaddr_p); /* get PSC id (0..11, used by port_config) */ - if (op->dev.platform_data == NULL) { - const u32 *psc_nump; - - psc_nump = of_get_property(op->dev.of_node, "cell-index", NULL); - if (!psc_nump || *psc_nump > 11) { - dev_err(&op->dev, "mpc512x_psc_spi: Device node %s " - "has invalid cell-index property\n", - op->dev.of_node->full_name); - return -EINVAL; - } - id = *psc_nump; + id = of_alias_get_id(op->dev.of_node, "spi"); + if (id < 0) { + dev_err(&op->dev, "no alias id for %s\n", + op->dev.of_node->full_name); + return id; } return mpc512x_psc_spi_do_probe(&op->dev, (u32) regaddr64, (u32) size64,