提交 fe6e125e 编写于 作者: R Richard Zhao 提交者: Greg Kroah-Hartman

USB: Chipidea: add ci13xxx device id management

We use ida_simple_get and ida_simple_remove to manage the ids.
Signed-off-by: NRichard Zhao <richard.zhao@freescale.com>
Reviewed-by: NFelipe Balbi <balbi@ti.com>
Signed-off-by: NAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 cbc6dc2a
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/idr.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -332,17 +333,24 @@ static irqreturn_t ci_irq(int irq, void *data) ...@@ -332,17 +333,24 @@ static irqreturn_t ci_irq(int irq, void *data)
return ci->role == CI_ROLE_END ? ret : ci_role(ci)->irq(ci); return ci->role == CI_ROLE_END ? ret : ci_role(ci)->irq(ci);
} }
static DEFINE_IDA(ci_ida);
struct platform_device *ci13xxx_add_device(struct device *dev, struct platform_device *ci13xxx_add_device(struct device *dev,
struct resource *res, int nres, struct resource *res, int nres,
struct ci13xxx_platform_data *platdata) struct ci13xxx_platform_data *platdata)
{ {
struct platform_device *pdev; struct platform_device *pdev;
int ret; int id, ret;
/* FIXME: find a way to choose id */ id = ida_simple_get(&ci_ida, 0, 0, GFP_KERNEL);
pdev = platform_device_alloc("ci_hdrc", -1); if (id < 0)
if (!pdev) return ERR_PTR(id);
return ERR_PTR(-ENOMEM);
pdev = platform_device_alloc("ci_hdrc", id);
if (!pdev) {
ret = -ENOMEM;
goto put_id;
}
pdev->dev.parent = dev; pdev->dev.parent = dev;
pdev->dev.dma_mask = dev->dma_mask; pdev->dev.dma_mask = dev->dma_mask;
...@@ -365,6 +373,8 @@ struct platform_device *ci13xxx_add_device(struct device *dev, ...@@ -365,6 +373,8 @@ struct platform_device *ci13xxx_add_device(struct device *dev,
err: err:
platform_device_put(pdev); platform_device_put(pdev);
put_id:
ida_simple_remove(&ci_ida, id);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
EXPORT_SYMBOL_GPL(ci13xxx_add_device); EXPORT_SYMBOL_GPL(ci13xxx_add_device);
...@@ -372,6 +382,7 @@ EXPORT_SYMBOL_GPL(ci13xxx_add_device); ...@@ -372,6 +382,7 @@ EXPORT_SYMBOL_GPL(ci13xxx_add_device);
void ci13xxx_remove_device(struct platform_device *pdev) void ci13xxx_remove_device(struct platform_device *pdev)
{ {
platform_device_unregister(pdev); platform_device_unregister(pdev);
ida_simple_remove(&ci_ida, pdev->id);
} }
EXPORT_SYMBOL_GPL(ci13xxx_remove_device); EXPORT_SYMBOL_GPL(ci13xxx_remove_device);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册