rapidio: modify mport ID assignment
Changes mport ID and host destination ID assignment to implement unified method common to all mport drivers. Makes "riohdid=" kernel command line parameter common for all architectures with support for more that one host destination ID assignment. Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Li Yang <leoli@freescale.com> Cc: Thomas Moll <thomas.moll@sysgo.com> Cc: Micha Nelissen <micha@neli.hopto.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

کامیت شده توسط
Linus Torvalds

والد
2f809985d2
کامیت
569fccb6b4
@@ -1288,28 +1288,6 @@ err_out:
|
||||
return rc;
|
||||
}
|
||||
|
||||
static char *cmdline = NULL;
|
||||
|
||||
static int fsl_rio_get_hdid(int index)
|
||||
{
|
||||
/* XXX Need to parse multiple entries in some format */
|
||||
if (!cmdline)
|
||||
return -1;
|
||||
|
||||
return simple_strtol(cmdline, NULL, 0);
|
||||
}
|
||||
|
||||
static int fsl_rio_get_cmdline(char *s)
|
||||
{
|
||||
if (!s)
|
||||
return 0;
|
||||
|
||||
cmdline = s;
|
||||
return 1;
|
||||
}
|
||||
|
||||
__setup("riohdid=", fsl_rio_get_cmdline);
|
||||
|
||||
static inline void fsl_rio_info(struct device *dev, u32 ccsr)
|
||||
{
|
||||
const char *str;
|
||||
@@ -1439,7 +1417,6 @@ int fsl_rio_setup(struct platform_device *dev)
|
||||
rc = -ENOMEM;
|
||||
goto err_port;
|
||||
}
|
||||
port->id = 0;
|
||||
port->index = 0;
|
||||
|
||||
priv = kzalloc(sizeof(struct rio_priv), GFP_KERNEL);
|
||||
@@ -1470,8 +1447,6 @@ int fsl_rio_setup(struct platform_device *dev)
|
||||
priv->dev = &dev->dev;
|
||||
|
||||
port->ops = ops;
|
||||
port->host_deviceid = fsl_rio_get_hdid(port->id);
|
||||
|
||||
port->priv = priv;
|
||||
port->phys_efptr = 0x100;
|
||||
rio_register_mport(port);
|
||||
|
مرجع در شماره جدید
Block a user