Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a32f7d1a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'v4l_for_linus' into staging/for_v3.9 

* 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
parents 6b9e50c4 68d6f84b

Documentation/DocBook/media/v4l/driver.xml

+3 −3
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ my_suspend (struct pci_dev * pci_dev, 
	return 0; /* a negative value on error, 0 on success. */

}



static void __devexit

static void

my_remove               (struct pci_dev *               pci_dev)

{

	my_device *my = pci_get_drvdata (pci_dev);
@@ -124,7 +124,7 @@ my_remove (struct pci_dev * pci_dev) 
	/* Describe me. */

}



static int __devinit

static int

my_probe                (struct pci_dev *               pci_dev,

			 const struct pci_device_id *   pci_id)

{
@@ -157,7 +157,7 @@ my_pci_driver = { 
	.id_table = my_pci_device_ids,



	.probe    = my_probe,

	.remove   = __devexit_p (my_remove),

	.remove   = my_remove,



	/* Power management functions. */

	.suspend  = my_suspend,

Documentation/PCI/pci-iov-howto.txt

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ To notify SR-IOV core of Virtual Function Migration: 


Following piece of code illustrates the usage of the SR-IOV API.



static int __devinit dev_probe(struct pci_dev *dev, const struct pci_device_id *id)

static int dev_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	pci_enable_sriov(dev, NR_VIRTFN);
@@ -85,7 +85,7 @@ static int __devinit dev_probe(struct pci_dev *dev, const struct pci_device_id * 
	return 0;

}



static void __devexit dev_remove(struct pci_dev *dev)

static void dev_remove(struct pci_dev *dev)

{

	pci_disable_sriov(dev);
@@ -131,7 +131,7 @@ static struct pci_driver dev_driver = { 
	.name =		"SR-IOV Physical Function driver",

	.id_table =	dev_id_table,

	.probe =	dev_probe,

	.remove =	__devexit_p(dev_remove),

	.remove =	dev_remove,

	.suspend =	dev_suspend,

	.resume =	dev_resume,

	.shutdown =	dev_shutdown,

Documentation/PCI/pci.txt

+0 −20
Original line number Diff line number Diff line
@@ -183,12 +183,6 @@ Please mark the initialization and cleanup functions where appropriate 
			initializes.

	__exit		Exit code. Ignored for non-modular drivers.





	__devinit	Device initialization code.

			Identical to __init if the kernel is not compiled

			with CONFIG_HOTPLUG, normal function otherwise.

	__devexit	The same for __exit.



Tips on when/where to use the above attributes:

	o The module_init()/module_exit() functions (and all

	  initialization functions called _only_ from these)
@@ -196,20 +190,6 @@ Tips on when/where to use the above attributes: 


	o Do not mark the struct pci_driver.



	o The ID table array should be marked __devinitconst; this is done

	  automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE().



	o The probe() and remove() functions should be marked __devinit

	  and __devexit respectively.  All initialization functions

	  exclusively called by the probe() routine, can be marked __devinit.

	  Ditto for remove() and __devexit.



	o If mydriver_remove() is marked with __devexit(), then all address

	  references to mydriver_remove must use __devexit_p(mydriver_remove)

	  (in the struct pci_driver declaration for example).

	  __devexit_p() will generate the function name _or_ NULL if the

	  function will be discarded.  For an example, see drivers/net/tg3.c.



	o Do NOT mark a function if you are not sure which mark to use.

	  Better to not mark the function than mark the function wrong.

Documentation/acpi/enumeration.txt

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ input driver: 
			.acpi_match_table  ACPI_PTR(mpu3050_acpi_match),

		},

		.probe		= mpu3050_probe,

		.remove		= __devexit_p(mpu3050_remove),

		.remove		= mpu3050_remove,

		.id_table	= mpu3050_ids,

	};

Documentation/devicetree/bindings/clock/imx23-clock.txt

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ clks: clkctrl@80040000 { 
	compatible = "fsl,imx23-clkctrl";

	reg = <0x80040000 0x2000>;

	#clock-cells = <1>;

	clock-output-names =

		...

		"uart",		/* 32 */

		...

		"end_of_list";

};



auart0: serial@8006c000 {