diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/sysdev/fsl_rio.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index 576b8066089e..8d26533ba98e 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c | |||
@@ -1288,28 +1288,6 @@ err_out: | |||
1288 | return rc; | 1288 | return rc; |
1289 | } | 1289 | } |
1290 | 1290 | ||
1291 | static char *cmdline = NULL; | ||
1292 | |||
1293 | static int fsl_rio_get_hdid(int index) | ||
1294 | { | ||
1295 | /* XXX Need to parse multiple entries in some format */ | ||
1296 | if (!cmdline) | ||
1297 | return -1; | ||
1298 | |||
1299 | return simple_strtol(cmdline, NULL, 0); | ||
1300 | } | ||
1301 | |||
1302 | static int fsl_rio_get_cmdline(char *s) | ||
1303 | { | ||
1304 | if (!s) | ||
1305 | return 0; | ||
1306 | |||
1307 | cmdline = s; | ||
1308 | return 1; | ||
1309 | } | ||
1310 | |||
1311 | __setup("riohdid=", fsl_rio_get_cmdline); | ||
1312 | |||
1313 | static inline void fsl_rio_info(struct device *dev, u32 ccsr) | 1291 | static inline void fsl_rio_info(struct device *dev, u32 ccsr) |
1314 | { | 1292 | { |
1315 | const char *str; | 1293 | const char *str; |
@@ -1439,7 +1417,6 @@ int fsl_rio_setup(struct platform_device *dev) | |||
1439 | rc = -ENOMEM; | 1417 | rc = -ENOMEM; |
1440 | goto err_port; | 1418 | goto err_port; |
1441 | } | 1419 | } |
1442 | port->id = 0; | ||
1443 | port->index = 0; | 1420 | port->index = 0; |
1444 | 1421 | ||
1445 | priv = kzalloc(sizeof(struct rio_priv), GFP_KERNEL); | 1422 | priv = kzalloc(sizeof(struct rio_priv), GFP_KERNEL); |
@@ -1470,8 +1447,6 @@ int fsl_rio_setup(struct platform_device *dev) | |||
1470 | priv->dev = &dev->dev; | 1447 | priv->dev = &dev->dev; |
1471 | 1448 | ||
1472 | port->ops = ops; | 1449 | port->ops = ops; |
1473 | port->host_deviceid = fsl_rio_get_hdid(port->id); | ||
1474 | |||
1475 | port->priv = priv; | 1450 | port->priv = priv; |
1476 | port->phys_efptr = 0x100; | 1451 | port->phys_efptr = 0x100; |
1477 | rio_register_mport(port); | 1452 | rio_register_mport(port); |