mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
usb: gadget: use dev_get_platdata()
Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
parent
b27f274d35
commit
e01ee9f509
16 changed files with 29 additions and 29 deletions
|
@ -1697,7 +1697,7 @@ static int at91udc_probe(struct platform_device *pdev)
|
|||
int retval;
|
||||
struct resource *res;
|
||||
|
||||
if (!dev->platform_data && !pdev->dev.of_node) {
|
||||
if (!dev_get_platdata(dev) && !pdev->dev.of_node) {
|
||||
/* small (so we copy it) but critical! */
|
||||
DBG("missing platform_data\n");
|
||||
return -ENODEV;
|
||||
|
@ -1728,7 +1728,7 @@ static int at91udc_probe(struct platform_device *pdev)
|
|||
if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node)
|
||||
at91udc_of_init(udc, pdev->dev.of_node);
|
||||
else
|
||||
memcpy(&udc->board, dev->platform_data,
|
||||
memcpy(&udc->board, dev_get_platdata(dev),
|
||||
sizeof(struct at91_udc_data));
|
||||
udc->pdev = pdev;
|
||||
udc->enabled = 0;
|
||||
|
|
|
@ -1931,7 +1931,7 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
|
|||
static struct usba_ep * usba_udc_pdata(struct platform_device *pdev,
|
||||
struct usba_udc *udc)
|
||||
{
|
||||
struct usba_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct usba_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
||||
struct usba_ep *eps;
|
||||
int i;
|
||||
|
||||
|
|
|
@ -2313,7 +2313,7 @@ static void bcm63xx_udc_cleanup_debugfs(struct bcm63xx_udc *udc)
|
|||
static int bcm63xx_udc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct bcm63xx_usbd_platform_data *pd = dev->platform_data;
|
||||
struct bcm63xx_usbd_platform_data *pd = dev_get_platdata(dev);
|
||||
struct bcm63xx_udc *udc;
|
||||
struct resource *res;
|
||||
int rc = -ENOMEM, i, irq;
|
||||
|
|
|
@ -33,7 +33,7 @@ int fsl_udc_clk_init(struct platform_device *pdev)
|
|||
unsigned long freq;
|
||||
int ret;
|
||||
|
||||
pdata = pdev->dev.platform_data;
|
||||
pdata = dev_get_platdata(&pdev->dev);
|
||||
|
||||
mxc_ipg_clk = devm_clk_get(&pdev->dev, "ipg");
|
||||
if (IS_ERR(mxc_ipg_clk)) {
|
||||
|
@ -80,7 +80,7 @@ int fsl_udc_clk_init(struct platform_device *pdev)
|
|||
|
||||
int fsl_udc_clk_finalize(struct platform_device *pdev)
|
||||
{
|
||||
struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
||||
int ret = 0;
|
||||
|
||||
/* workaround ENGcm09152 for i.MX35 */
|
||||
|
|
|
@ -2248,7 +2248,7 @@ static int __init struct_udc_setup(struct fsl_udc *udc,
|
|||
struct fsl_usb2_platform_data *pdata;
|
||||
size_t size;
|
||||
|
||||
pdata = pdev->dev.platform_data;
|
||||
pdata = dev_get_platdata(&pdev->dev);
|
||||
udc->phy_mode = pdata->phy_mode;
|
||||
|
||||
udc->eps = kzalloc(sizeof(struct fsl_ep) * udc->max_ep, GFP_KERNEL);
|
||||
|
@ -2343,7 +2343,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
pdata = pdev->dev.platform_data;
|
||||
pdata = dev_get_platdata(&pdev->dev);
|
||||
udc_controller->pdata = pdata;
|
||||
spin_lock_init(&udc_controller->lock);
|
||||
udc_controller->stopped = 1;
|
||||
|
@ -2524,7 +2524,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
|
|||
static int __exit fsl_udc_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
||||
|
||||
DECLARE_COMPLETION(done);
|
||||
|
||||
|
|
|
@ -185,7 +185,7 @@ static int __exit hid_unbind(struct usb_composite_dev *cdev)
|
|||
|
||||
static int __init hidg_plat_driver_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct hidg_func_descriptor *func = pdev->dev.platform_data;
|
||||
struct hidg_func_descriptor *func = dev_get_platdata(&pdev->dev);
|
||||
struct hidg_func_node *entry;
|
||||
|
||||
if (!func) {
|
||||
|
|
|
@ -1584,7 +1584,7 @@ static int __init m66592_probe(struct platform_device *pdev)
|
|||
goto clean_up;
|
||||
}
|
||||
|
||||
if (pdev->dev.platform_data == NULL) {
|
||||
if (dev_get_platdata(&pdev->dev) == NULL) {
|
||||
dev_err(&pdev->dev, "no platform data\n");
|
||||
ret = -ENODEV;
|
||||
goto clean_up;
|
||||
|
@ -1598,7 +1598,7 @@ static int __init m66592_probe(struct platform_device *pdev)
|
|||
goto clean_up;
|
||||
}
|
||||
|
||||
m66592->pdata = pdev->dev.platform_data;
|
||||
m66592->pdata = dev_get_platdata(&pdev->dev);
|
||||
m66592->irq_trigger = ires->flags & IRQF_TRIGGER_MASK;
|
||||
|
||||
spin_lock_init(&m66592->lock);
|
||||
|
|
|
@ -1109,7 +1109,7 @@ static int mv_u3d_controller_reset(struct mv_u3d *u3d)
|
|||
|
||||
static int mv_u3d_enable(struct mv_u3d *u3d)
|
||||
{
|
||||
struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
|
||||
struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
|
||||
int retval;
|
||||
|
||||
if (u3d->active)
|
||||
|
@ -1138,7 +1138,7 @@ static int mv_u3d_enable(struct mv_u3d *u3d)
|
|||
|
||||
static void mv_u3d_disable(struct mv_u3d *u3d)
|
||||
{
|
||||
struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
|
||||
struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
|
||||
if (u3d->clock_gating && u3d->active) {
|
||||
dev_dbg(u3d->dev, "disable u3d\n");
|
||||
if (pdata->phy_deinit)
|
||||
|
@ -1246,7 +1246,7 @@ static int mv_u3d_start(struct usb_gadget *g,
|
|||
struct usb_gadget_driver *driver)
|
||||
{
|
||||
struct mv_u3d *u3d = container_of(g, struct mv_u3d, gadget);
|
||||
struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
|
||||
struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
|
||||
unsigned long flags;
|
||||
|
||||
if (u3d->driver)
|
||||
|
@ -1277,7 +1277,7 @@ static int mv_u3d_stop(struct usb_gadget *g,
|
|||
struct usb_gadget_driver *driver)
|
||||
{
|
||||
struct mv_u3d *u3d = container_of(g, struct mv_u3d, gadget);
|
||||
struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
|
||||
struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
|
||||
unsigned long flags;
|
||||
|
||||
u3d->vbus_valid_detect = 0;
|
||||
|
@ -1794,12 +1794,12 @@ static int mv_u3d_remove(struct platform_device *dev)
|
|||
static int mv_u3d_probe(struct platform_device *dev)
|
||||
{
|
||||
struct mv_u3d *u3d = NULL;
|
||||
struct mv_usb_platform_data *pdata = dev->dev.platform_data;
|
||||
struct mv_usb_platform_data *pdata = dev_get_platdata(&dev->dev);
|
||||
int retval = 0;
|
||||
struct resource *r;
|
||||
size_t size;
|
||||
|
||||
if (!dev->dev.platform_data) {
|
||||
if (!dev_get_platdata(&dev->dev)) {
|
||||
dev_err(&dev->dev, "missing platform_data\n");
|
||||
retval = -ENODEV;
|
||||
goto err_pdata;
|
||||
|
|
|
@ -2100,7 +2100,7 @@ static int mv_udc_remove(struct platform_device *pdev)
|
|||
|
||||
static int mv_udc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct mv_usb_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct mv_usb_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
||||
struct mv_udc *udc;
|
||||
int retval = 0;
|
||||
struct resource *r;
|
||||
|
@ -2118,7 +2118,7 @@ static int mv_udc_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
udc->done = &release_done;
|
||||
udc->pdata = pdev->dev.platform_data;
|
||||
udc->pdata = dev_get_platdata(&pdev->dev);
|
||||
spin_lock_init(&udc->lock);
|
||||
|
||||
udc->dev = pdev;
|
||||
|
|
|
@ -2734,7 +2734,7 @@ static int omap_udc_probe(struct platform_device *pdev)
|
|||
int hmc;
|
||||
struct usb_phy *xceiv = NULL;
|
||||
const char *type = NULL;
|
||||
struct omap_usb_config *config = pdev->dev.platform_data;
|
||||
struct omap_usb_config *config = dev_get_platdata(&pdev->dev);
|
||||
struct clk *dc_clk = NULL;
|
||||
struct clk *hhc_clk = NULL;
|
||||
|
||||
|
|
|
@ -2117,7 +2117,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
|
|||
|
||||
/* other non-static parts of init */
|
||||
dev->dev = &pdev->dev;
|
||||
dev->mach = pdev->dev.platform_data;
|
||||
dev->mach = dev_get_platdata(&pdev->dev);
|
||||
|
||||
dev->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
|
||||
|
||||
|
|
|
@ -2422,7 +2422,7 @@ static int pxa_udc_probe(struct platform_device *pdev)
|
|||
return udc->irq;
|
||||
|
||||
udc->dev = &pdev->dev;
|
||||
udc->mach = pdev->dev.platform_data;
|
||||
udc->mach = dev_get_platdata(&pdev->dev);
|
||||
udc->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
|
||||
|
||||
gpio = udc->mach->gpio_pullup;
|
||||
|
|
|
@ -1910,7 +1910,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
|
|||
|
||||
spin_lock_init(&r8a66597->lock);
|
||||
platform_set_drvdata(pdev, r8a66597);
|
||||
r8a66597->pdata = pdev->dev.platform_data;
|
||||
r8a66597->pdata = dev_get_platdata(&pdev->dev);
|
||||
r8a66597->irq_sense_low = irq_trigger == IRQF_TRIGGER_LOW;
|
||||
|
||||
r8a66597->gadget.ops = &r8a66597_gadget_ops;
|
||||
|
|
|
@ -3451,7 +3451,7 @@ static void s3c_hsotg_delete_debug(struct s3c_hsotg *hsotg)
|
|||
|
||||
static int s3c_hsotg_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct s3c_hsotg_plat *plat = pdev->dev.platform_data;
|
||||
struct s3c_hsotg_plat *plat = dev_get_platdata(&pdev->dev);
|
||||
struct usb_phy *phy;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct s3c_hsotg_ep *eps;
|
||||
|
@ -3470,7 +3470,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
|
|||
phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
|
||||
if (IS_ERR(phy)) {
|
||||
/* Fallback for pdata */
|
||||
plat = pdev->dev.platform_data;
|
||||
plat = dev_get_platdata(&pdev->dev);
|
||||
if (!plat) {
|
||||
dev_err(&pdev->dev, "no platform data or transceiver defined\n");
|
||||
return -EPROBE_DEFER;
|
||||
|
|
|
@ -1262,7 +1262,7 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
|
|||
struct device *dev = &pdev->dev;
|
||||
struct resource *res;
|
||||
struct s3c_hsudc *hsudc;
|
||||
struct s3c24xx_hsudc_platdata *pd = pdev->dev.platform_data;
|
||||
struct s3c24xx_hsudc_platdata *pd = dev_get_platdata(&pdev->dev);
|
||||
int ret, i;
|
||||
|
||||
hsudc = devm_kzalloc(&pdev->dev, sizeof(struct s3c_hsudc) +
|
||||
|
@ -1275,7 +1275,7 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
|
|||
|
||||
platform_set_drvdata(pdev, dev);
|
||||
hsudc->dev = dev;
|
||||
hsudc->pd = pdev->dev.platform_data;
|
||||
hsudc->pd = dev_get_platdata(&pdev->dev);
|
||||
|
||||
hsudc->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
|
||||
|
||||
|
|
|
@ -1809,7 +1809,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
spin_lock_init(&udc->lock);
|
||||
udc_info = pdev->dev.platform_data;
|
||||
udc_info = dev_get_platdata(&pdev->dev);
|
||||
|
||||
rsrc_start = S3C2410_PA_USBDEV;
|
||||
rsrc_len = S3C24XX_SZ_USBDEV;
|
||||
|
|
Loading…
Reference in a new issue