xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Tükrözés 0
Kód Hibajegyek Egyesítési kérések Actions Packages Projektek Kiadások Wiki Tevékenység

Merge branch 'v4l_for_linus' into staging/for_v3.9

Forráskód böngészése 
* v4l_for_linus: (464 commits)
  [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failures
  [media] uvcvideo: Cleanup leftovers of partial revert
  [media] uvcvideo: Return -EACCES when trying to set a read-only control
  Linux 3.8-rc3
  mm: reinstante dropped pmd_trans_splitting() check
  cred: Remove tgcred pointer from struct cred
  drm/ttm: fix fence locking in ttm_buffer_object_transfer
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  drm/prime: drop reference on imported dma-buf come from gem
  xen/netfront: improve truesize tracking
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  sctp: fix Kconfig bug in default cookie hmac selection
  EDAC: Cleanup device deregistering path
  ...

Conflicts:
	drivers/media/pci/dm1105/dm1105.c
	drivers/media/platform/soc_camera/mx2_camera.c
This commit is contained in:
Mauro Carvalho Chehab
2013-01-24 18:49:18 -02:00
szülő 6b9e50c463 68d6f84ba0
commit a32f7d1ad3
1591 fájl változott, egészen pontosan 9876 új sor hozzáadva és 9096 régi sor törölve
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/rc/ene_ir.c
Fájl megtekintése

@@ -1172,7 +1172,7 @@ static struct pnp_driver ene_driver = {
.flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
.probe = ene_probe,
.remove = __devexit_p(ene_remove),
.remove = ene_remove,
#ifdef CONFIG_PM
.suspend = ene_suspend,
.resume = ene_resume,

4
drivers/media/rc/fintek-cir.c
Fájl megtekintése

@@ -592,7 +592,7 @@ exit_free_dev_rdev:
return ret;
}
static void __devexit fintek_remove(struct pnp_dev *pdev)
static void fintek_remove(struct pnp_dev *pdev)
{
struct fintek_dev *fintek = pnp_get_drvdata(pdev);
unsigned long flags;
@@ -680,7 +680,7 @@ static struct pnp_driver fintek_driver = {
.id_table = fintek_ids,
.flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
.probe = fintek_probe,
.remove = __devexit_p(fintek_remove),
.remove = fintek_remove,
.suspend = fintek_suspend,
.resume = fintek_resume,
.shutdown = fintek_shutdown,

6
drivers/media/rc/gpio-ir-recv.c
Fájl megtekintése

@@ -58,7 +58,7 @@ err_get_value:
return IRQ_HANDLED;
}
static int __devinit gpio_ir_recv_probe(struct platform_device *pdev)
static int gpio_ir_recv_probe(struct platform_device *pdev)
{
struct gpio_rc_dev *gpio_dev;
struct rc_dev *rcdev;
@@ -140,7 +140,7 @@ err_allocate_device:
return rc;
}
static int __devexit gpio_ir_recv_remove(struct platform_device *pdev)
static int gpio_ir_recv_remove(struct platform_device *pdev)
{
struct gpio_rc_dev *gpio_dev = platform_get_drvdata(pdev);
@@ -187,7 +187,7 @@ static const struct dev_pm_ops gpio_ir_recv_pm_ops = {
static struct platform_driver gpio_ir_recv_driver = {
.probe = gpio_ir_recv_probe,
.remove = __devexit_p(gpio_ir_recv_remove),
.remove = gpio_ir_recv_remove,
.driver = {
.name = GPIO_IR_DRIVER_NAME,
.owner = THIS_MODULE,

8
drivers/media/rc/iguanair.c
Fájl megtekintése

@@ -425,8 +425,8 @@ static void iguanair_close(struct rc_dev *rdev)
mutex_unlock(&ir->lock);
}
static int __devinit iguanair_probe(struct usb_interface *intf,
const struct usb_device_id *id)
static int iguanair_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct usb_device *udev = interface_to_usbdev(intf);
struct iguanair *ir;
@@ -538,7 +538,7 @@ out:
return ret;
}
static void __devexit iguanair_disconnect(struct usb_interface *intf)
static void iguanair_disconnect(struct usb_interface *intf)
{
struct iguanair *ir = usb_get_intfdata(intf);
@@ -604,7 +604,7 @@ static const struct usb_device_id iguanair_table[] = {
static struct usb_driver iguanair_driver = {
.name = DRIVER_NAME,
.probe = iguanair_probe,
.disconnect = __devexit_p(iguanair_disconnect),
.disconnect = iguanair_disconnect,
.suspend = iguanair_suspend,
.resume = iguanair_resume,
.reset_resume = iguanair_resume,

8
drivers/media/rc/imon.c
Fájl megtekintése

@@ -255,7 +255,7 @@ static struct usb_device_id imon_usb_id_table[] = {
static struct usb_driver imon_driver = {
.name = MOD_NAME,
.probe = imon_probe,
.disconnect = __devexit_p(imon_disconnect),
.disconnect = imon_disconnect,
.suspend = imon_suspend,
.resume = imon_resume,
.id_table = imon_usb_id_table,
@@ -2288,8 +2288,8 @@ static void imon_init_display(struct imon_context *ictx,
/**
* Callback function for USB core API: Probe
*/
static int __devinit imon_probe(struct usb_interface *interface,
const struct usb_device_id *id)
static int imon_probe(struct usb_interface *interface,
const struct usb_device_id *id)
{
struct usb_device *usbdev = NULL;
struct usb_host_interface *iface_desc = NULL;
@@ -2372,7 +2372,7 @@ fail:
/**
* Callback function for USB core API: disconnect
*/
static void __devexit imon_disconnect(struct usb_interface *interface)
static void imon_disconnect(struct usb_interface *interface)
{
struct imon_context *ictx;
struct device *dev;

2
drivers/media/rc/ir-rx51.c
Fájl megtekintése

@@ -443,7 +443,7 @@ static int lirc_rx51_resume(struct platform_device *dev)
#endif /* CONFIG_PM */
static int __devinit lirc_rx51_probe(struct platform_device *dev)
static int lirc_rx51_probe(struct platform_device *dev)
{
lirc_rx51_driver.features = LIRC_RX51_DRIVER_FEATURES;
lirc_rx51.pdata = dev->dev.platform_data;

4
drivers/media/rc/ite-cir.c
Fájl megtekintése

@@ -1620,7 +1620,7 @@ exit_free_dev_rdev:
return ret;
}
static void __devexit ite_remove(struct pnp_dev *pdev)
static void ite_remove(struct pnp_dev *pdev)
{
struct ite_dev *dev = pnp_get_drvdata(pdev);
unsigned long flags;
@@ -1702,7 +1702,7 @@ static struct pnp_driver ite_driver = {
.name = ITE_DRIVER_NAME,
.id_table = ite_ids,
.probe = ite_probe,
.remove = __devexit_p(ite_remove),
.remove = ite_remove,
.suspend = ite_suspend,
.resume = ite_resume,
.shutdown = ite_shutdown,

8
drivers/media/rc/mceusb.c
Fájl megtekintése

@@ -1229,8 +1229,8 @@ out:
return NULL;
}
static int __devinit mceusb_dev_probe(struct usb_interface *intf,
const struct usb_device_id *id)
static int mceusb_dev_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct usb_device *dev = interface_to_usbdev(intf);
struct usb_host_interface *idesc;
@@ -1393,7 +1393,7 @@ mem_alloc_fail:
}
static void __devexit mceusb_dev_disconnect(struct usb_interface *intf)
static void mceusb_dev_disconnect(struct usb_interface *intf)
{
struct usb_device *dev = interface_to_usbdev(intf);
struct mceusb_dev *ir = usb_get_intfdata(intf);
@@ -1432,7 +1432,7 @@ static int mceusb_dev_resume(struct usb_interface *intf)
static struct usb_driver mceusb_dev_driver = {
.name = DRIVER_NAME,
.probe = mceusb_dev_probe,
.disconnect = __devexit_p(mceusb_dev_disconnect),
.disconnect = mceusb_dev_disconnect,
.suspend = mceusb_dev_suspend,
.resume = mceusb_dev_resume,
.reset_resume = mceusb_dev_resume,

4
drivers/media/rc/nuvoton-cir.c
Fájl megtekintése

@@ -1114,7 +1114,7 @@ exit_free_dev_rdev:
return ret;
}
static void __devexit nvt_remove(struct pnp_dev *pdev)
static void nvt_remove(struct pnp_dev *pdev)
{
struct nvt_dev *nvt = pnp_get_drvdata(pdev);
unsigned long flags;
@@ -1212,7 +1212,7 @@ static struct pnp_driver nvt_driver = {
.id_table = nvt_ids,
.flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
.probe = nvt_probe,
.remove = __devexit_p(nvt_remove),
.remove = nvt_remove,
.suspend = nvt_suspend,
.resume = nvt_resume,
.shutdown = nvt_shutdown,

8
drivers/media/rc/redrat3.c
Fájl megtekintése

@@ -1102,8 +1102,8 @@ out:
return NULL;
}
static int __devinit redrat3_dev_probe(struct usb_interface *intf,
const struct usb_device_id *id)
static int redrat3_dev_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct usb_device *udev = interface_to_usbdev(intf);
struct device *dev = &intf->dev;
@@ -1241,7 +1241,7 @@ no_endpoints:
return retval;
}
static void __devexit redrat3_dev_disconnect(struct usb_interface *intf)
static void redrat3_dev_disconnect(struct usb_interface *intf)
{
struct usb_device *udev = interface_to_usbdev(intf);
struct redrat3_dev *rr3 = usb_get_intfdata(intf);
@@ -1281,7 +1281,7 @@ static int redrat3_dev_resume(struct usb_interface *intf)
static struct usb_driver redrat3_dev_driver = {
.name = DRIVER_NAME,
.probe = redrat3_dev_probe,
.disconnect = __devexit_p(redrat3_dev_disconnect),
.disconnect = redrat3_dev_disconnect,
.suspend = redrat3_dev_suspend,
.resume = redrat3_dev_resume,
.reset_resume = redrat3_dev_resume,

4
drivers/media/rc/streamzap.c
Fájl megtekintése

@@ -346,8 +346,8 @@ out:
* On any failure the return value is the ERROR
* On success return 0
*/
static int __devinit streamzap_probe(struct usb_interface *intf,
const struct usb_device_id *id)
static int streamzap_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct usb_device *usbdev = interface_to_usbdev(intf);
struct usb_host_interface *iface_host;

8
drivers/media/rc/ttusbir.c
Fájl megtekintése

@@ -194,8 +194,8 @@ static void ttusbir_urb_complete(struct urb *urb)
dev_warn(tt->dev, "failed to resubmit urb: %d\n", rc);
}
static int __devinit ttusbir_probe(struct usb_interface *intf,
const struct usb_device_id *id)
static int ttusbir_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct ttusbir *tt;
struct usb_interface_descriptor *idesc;
@@ -367,7 +367,7 @@ out:
return ret;
}
static void __devexit ttusbir_disconnect(struct usb_interface *intf)
static void ttusbir_disconnect(struct usb_interface *intf)
{
struct ttusbir *tt = usb_get_intfdata(intf);
struct usb_device *udev = tt->udev;
@@ -435,7 +435,7 @@ static struct usb_driver ttusbir_driver = {
.suspend = ttusbir_suspend,
.resume = ttusbir_resume,
.reset_resume = ttusbir_resume,
.disconnect = __devexit_p(ttusbir_disconnect)
.disconnect = ttusbir_disconnect,
};
module_usb_driver(ttusbir_driver);

6
drivers/media/rc/winbond-cir.c
Fájl megtekintése

@@ -1008,7 +1008,7 @@ wbcir_resume(struct pnp_dev *device)
return 0;
}
static int __devinit
static int
wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
{
struct device *dev = &device->dev;
@@ -1155,7 +1155,7 @@ exit:
return err;
}
static void __devexit
static void
wbcir_remove(struct pnp_dev *device)
{
struct wbcir_data *data = pnp_get_drvdata(device);
@@ -1201,7 +1201,7 @@ static struct pnp_driver wbcir_driver = {
.name = WBCIR_NAME,
.id_table = wbcir_ids,
.probe = wbcir_probe,
.remove = __devexit_p(wbcir_remove),
.remove = wbcir_remove,
.suspend = wbcir_suspend,
.resume = wbcir_resume,
.shutdown = wbcir_shutdown