mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
56d95f3174
As pointed out by Dan Carpenter, the check for NULL for the id variable
is no longer needed, especially as we just dereferenced it a few lines
earlier, causing an oops if it really was NULL.
This was caused by 62bb84ed0e: "usb: gadget: ci13xxx: convert to
platform device".
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
171 lines
4.4 KiB
C
171 lines
4.4 KiB
C
/*
|
|
* ci13xxx_pci.c - MIPS USB IP core family device controller
|
|
*
|
|
* Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved.
|
|
*
|
|
* Author: David Lopo
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/usb/gadget.h>
|
|
|
|
#include "ci13xxx_udc.h"
|
|
|
|
/* driver name */
|
|
#define UDC_DRIVER_NAME "ci13xxx_pci"
|
|
|
|
/******************************************************************************
|
|
* PCI block
|
|
*****************************************************************************/
|
|
struct ci13xxx_udc_driver pci_driver = {
|
|
.name = UDC_DRIVER_NAME,
|
|
.capoffset = DEF_CAPOFFSET,
|
|
};
|
|
|
|
struct ci13xxx_udc_driver langwell_pci_driver = {
|
|
.name = UDC_DRIVER_NAME,
|
|
.capoffset = 0,
|
|
};
|
|
|
|
/**
|
|
* ci13xxx_pci_probe: PCI probe
|
|
* @pdev: USB device controller being probed
|
|
* @id: PCI hotplug ID connecting controller to UDC framework
|
|
*
|
|
* This function returns an error code
|
|
* Allocates basic PCI resources for this USB device controller, and then
|
|
* invokes the udc_probe() method to start the UDC associated with it
|
|
*/
|
|
static int __devinit ci13xxx_pci_probe(struct pci_dev *pdev,
|
|
const struct pci_device_id *id)
|
|
{
|
|
struct ci13xxx_udc_driver *driver = (void *)id->driver_data;
|
|
struct platform_device *plat_ci;
|
|
struct resource res[3];
|
|
int retval = 0, nres = 2;
|
|
|
|
retval = pci_enable_device(pdev);
|
|
if (retval)
|
|
goto done;
|
|
|
|
if (!pdev->irq) {
|
|
dev_err(&pdev->dev, "No IRQ, check BIOS/PCI setup!");
|
|
retval = -ENODEV;
|
|
goto disable_device;
|
|
}
|
|
|
|
pci_set_power_state(pdev, PCI_D0);
|
|
pci_set_master(pdev);
|
|
pci_try_set_mwi(pdev);
|
|
|
|
plat_ci = platform_device_alloc("ci_udc", -1);
|
|
if (!plat_ci) {
|
|
dev_err(&pdev->dev, "can't allocate ci_udc platform device\n");
|
|
retval = -ENOMEM;
|
|
goto disable_device;
|
|
}
|
|
|
|
memset(res, 0, sizeof(res));
|
|
res[0].start = pci_resource_start(pdev, 0);
|
|
res[0].end = pci_resource_end(pdev, 0);
|
|
res[0].flags = IORESOURCE_MEM;
|
|
res[1].start = pdev->irq;
|
|
res[1].flags = IORESOURCE_IRQ;
|
|
|
|
retval = platform_device_add_resources(plat_ci, res, nres);
|
|
if (retval) {
|
|
dev_err(&pdev->dev, "can't add resources to platform device\n");
|
|
goto put_platform;
|
|
}
|
|
|
|
retval = platform_device_add_data(plat_ci, driver, sizeof(*driver));
|
|
if (retval)
|
|
goto put_platform;
|
|
|
|
dma_set_coherent_mask(&plat_ci->dev, pdev->dev.coherent_dma_mask);
|
|
plat_ci->dev.dma_mask = pdev->dev.dma_mask;
|
|
plat_ci->dev.dma_parms = pdev->dev.dma_parms;
|
|
plat_ci->dev.parent = &pdev->dev;
|
|
|
|
pci_set_drvdata(pdev, plat_ci);
|
|
|
|
retval = platform_device_add(plat_ci);
|
|
if (retval)
|
|
goto put_platform;
|
|
|
|
return 0;
|
|
|
|
put_platform:
|
|
pci_set_drvdata(pdev, NULL);
|
|
platform_device_put(plat_ci);
|
|
disable_device:
|
|
pci_disable_device(pdev);
|
|
done:
|
|
return retval;
|
|
}
|
|
|
|
/**
|
|
* ci13xxx_pci_remove: PCI remove
|
|
* @pdev: USB Device Controller being removed
|
|
*
|
|
* Reverses the effect of ci13xxx_pci_probe(),
|
|
* first invoking the udc_remove() and then releases
|
|
* all PCI resources allocated for this USB device controller
|
|
*/
|
|
static void __devexit ci13xxx_pci_remove(struct pci_dev *pdev)
|
|
{
|
|
struct platform_device *plat_ci = pci_get_drvdata(pdev);
|
|
|
|
platform_device_unregister(plat_ci);
|
|
pci_set_drvdata(pdev, NULL);
|
|
pci_disable_device(pdev);
|
|
}
|
|
|
|
/**
|
|
* PCI device table
|
|
* PCI device structure
|
|
*
|
|
* Check "pci.h" for details
|
|
*/
|
|
static DEFINE_PCI_DEVICE_TABLE(ci13xxx_pci_id_table) = {
|
|
{
|
|
PCI_DEVICE(0x153F, 0x1004),
|
|
.driver_data = (kernel_ulong_t)&pci_driver,
|
|
},
|
|
{
|
|
PCI_DEVICE(0x153F, 0x1006),
|
|
.driver_data = (kernel_ulong_t)&pci_driver,
|
|
},
|
|
{
|
|
PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0811),
|
|
.driver_data = (kernel_ulong_t)&langwell_pci_driver,
|
|
},
|
|
{
|
|
PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0829),
|
|
.driver_data = (kernel_ulong_t)&langwell_pci_driver,
|
|
},
|
|
{ 0, 0, 0, 0, 0, 0, 0 /* end: all zeroes */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(pci, ci13xxx_pci_id_table);
|
|
|
|
static struct pci_driver ci13xxx_pci_driver = {
|
|
.name = UDC_DRIVER_NAME,
|
|
.id_table = ci13xxx_pci_id_table,
|
|
.probe = ci13xxx_pci_probe,
|
|
.remove = __devexit_p(ci13xxx_pci_remove),
|
|
};
|
|
|
|
module_pci_driver(ci13xxx_pci_driver);
|
|
|
|
MODULE_AUTHOR("MIPS - David Lopo <dlopo@chipidea.mips.com>");
|
|
MODULE_DESCRIPTION("MIPS CI13XXX USB Peripheral Controller");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_VERSION("June 2008");
|