summaryrefslogtreecommitdiffstats
path: root/drivers/staging/goldfish
Commit message (Collapse)AuthorAgeFilesLines
* staging: goldfish: avoid multiple assignmentsLoic Pefferkorn2014-09-071-1/+2
| | | | | | | Coding style: avoid multiple assignments Signed-off-by: Loic Pefferkorn <loic@loicp.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: goldfish: document mutex usageLoic Pefferkorn2014-09-071-0/+1
| | | | | | | Coding style: document mutex usage Signed-off-by: Loic Pefferkorn <loic@loicp.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: goldfish: fix alignment to match open parenthesisLoic Pefferkorn2014-09-072-29/+28Star
| | | | | | | Coding style: fix alignment to match open parenthesis Signed-off-by: Loic Pefferkorn <loic@loicp.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: goldfish: document spinlock usageLoic Pefferkorn2014-09-071-0/+1
| | | | | | | Coding style: document spinlock usage Signed-off-by: Loic Pefferkorn <loic@loicp.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: goldfish: remove useless space after a castLoic Pefferkorn2014-09-071-1/+1
| | | | | | | Coding style: remove useless space after a cast Signed-off-by: Loic Pefferkorn <loic@loicp.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: goldfish: suppress consecutive blank linesLoic Pefferkorn2014-09-071-2/+0Star
| | | | | | | Coding style: suppress consecutive blank lines Signed-off-by: Loic Pefferkorn <loic@loicp.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/goldfish/goldfish_audio: fix a sparse warningRobin Schroer2014-07-241-1/+1
| | | | | | | | | | | | Fix a pointer check to use NULL instead of 0 Warning: drivers/staging/goldfish/goldfish_audio.c:300:34: warning: Using plain integer as NULL pointer Signed-off-by: Robin Schroer <sulamiification@gmail.com> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: goldfish: Introduce the use of managed interfacesHimangi Saraogi2014-07-091-40/+13Star
| | | | | | | | | | | This patch introduces the use of managed interfaces like devm_kzalloc, devm_ioremap, dmam_alloc_coherent, devm_request_irq and does away with the calls to functions to free the allocated memory in the probe and remove functions. Also, the labels are removed in the probe function. Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: goldfish: fix coding style.Hoang Tran2014-06-191-5/+5
| | | | | | | | | | | Using an else following a break or return can unnecessarily indent code blocks. This patch fixes coding style reported by checkpatch.pl, a part of eudyptula challenge. Signed-off-by: Hoang Tran <hoangtran.gwr@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* goldfish: clean up staging ifdefsAlan2014-05-153-40/+13Star
| | | | | | | Use the write helpers and add an audio helper Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* goldfish_nand.c: remove length restrictionsNick Kralevich2014-05-151-4/+0Star
| | | | | | | | | | | | | | | Remove limitations on the size of a read / write request. AFAIK, there's no consequence to allowing the upper layers to specify different read / write sizes. This is needed to support running ext4 on goldfish. Bug: https://code.google.com/p/android/issues/detail?id=38561 Signed-off-by: Nick Kralevich <nnk@google.com> Signed-off-by: Jun Tian <jun.j.tian@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* goldfish: 64-bit nand driver for goldfish platformJun Tian2014-05-042-2/+8
| | | | | | | | | Enable the 64-bit nand data support in the goldfish nand driver. Signed-off-by: Jun Tian <jun.j.tian@intel.com> Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* goldfish: 64-bit audio driver for goldfish platformJun Tian2014-05-041-0/+33
| | | | | | | | | Enable the 64-bit goldfish audio driver. Support 64-bit buffer address and data read/write. Signed-off-by: Jun Tian <jun.j.tian@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Merge 3.15-rc2 into staging-nextGreg Kroah-Hartman2014-04-221-0/+1
|\ | | | | | | | | | | | | This resolves a bunch of merge errors with other fixes that are already in Linus's tree. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: goldfish: Call free_irq in error pathTuomas Tynkkynen2014-04-161-0/+1
| | | | | | | | | | | | | | | | | | | | If misc_register failed in goldfish_audio_probe, the already requested IRQ wouldn't get freed. Add a call to free_irq() like there is in goldfish_audio_remove(). Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: goldfish: Fix missing blank linesGarret Kelly2014-04-172-0/+2
| | | | | | | | | | | | | | | | Fix two instances of the following checkpatch warning: WARNING: Missing a blank line after declarations Signed-off-by: Garret Kelly <garret.kelly@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: goldfish: switch from spinlock to mutexKristina Martšenko2014-04-172-9/+7Star
|/ | | | | | | | | Use a mutex instead of a spinlock in goldfish_nand.c, as suggested by the TODO list. Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: delete non-required instances of include <linux/init.h>Paul Gortmaker2013-12-171-1/+0Star
| | | | | | | | | | None of these files are actually using any __init type directives and hence don't need to include <linux/init.h>. Most are just a left over from __devinit and __cpuinit removal, or simply due to code getting copied from one driver to the next. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/goldfish: Fixed up incorrect formatted comments.Sara Bird2013-05-212-25/+34
| | | | | | | | The existing comments are using an odd style. Fixed them up to adhereto the StyleGuide. No code changes. Signed-off-by: Sara Bird <sara.bird.iar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: goldfish: Fixed line over 80 charactersHema Prathaban2013-05-132-3/+6
| | | | | | | | Fixes the following checkpatch warning: WARNING: line over 80 characters Signed-off-by: Hema Prathaban <hemaklnce@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: goldfish: Fixed Trailing WhitespaceHema Prathaban2013-05-131-4/+4
| | | | | | | | Fixes the following checkpatch Error: Error: trailing whitespace Signed-off-by: Hema Prathaban <hemaklnce@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/goldfish: Add MTD dependency to KCONFIGPeter Huewe2013-02-081-0/+1
| | | | | | | | | | | | | | | | | | | If CONFIG_MTD is not set goldfish_nand fails to compile with the following linker warnings: drivers/built-in.o: In function `goldfish_nand_remove': goldfish_nand.c:(.text+0x6e7d0e): undefined reference to `mtd_device_unregister' drivers/built-in.o: In function `goldfish_nand_erase': goldfish_nand.c:(.text+0x6e8ba2): undefined reference to `mtd_erase_callback' drivers/built-in.o: In function `goldfish_nand_init_device': goldfish_nand.c:(.text+0x6e8eba): undefined reference to `mtd_device_parse_register' Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/goldfish: Use %zx for printing size_t variablesPeter Huewe2013-02-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building the driver, gcc emits the following warnings: .../drivers/staging/goldfish/goldfish_nand.c: In function 'goldfish_nand_read_oob': goldfish_nand.c:159:2: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'size_t' [-Wformat] goldfish_nand.c:159:2: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'size_t' [-Wformat] In function 'goldfish_nand_write_oob': goldfish_nand.c:191:2: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'size_t' [-Wformat] goldfish_nand.c:191:2: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'size_t' [-Wformat] In function 'goldfish_nand_read': goldfish_nand.c:215:2: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'size_t' [-Wformat] In function 'goldfish_nand_write': goldfish_nand.c:239:2: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'size_t' [-Wformat] -> As defined in the printk-formats use %zx for size_t variables Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* goldfish: NAND flash driverArve Hjønnevåg2013-01-245-0/+533
| | | | | | | | | | | | | | | | | | | | | | | Fold together the NAND driver for Goldfish from Arve with cleanups by Jun Nakajima and a tidy up to 3.7 and checkpatch. This provides a virtual flash driver for the Goldfish Android Virtual Platform, and which is normally used as the root file system when testing emulated devices. Signed-off-by: Mike A. Chan <mikechan@google.com> Signed-off-by: Arve Hjønnevåg <arve@android.com> [Ported to handle x86] Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com> Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> [Ported to 3.4] Signed-off-by: Tom Keel <thomas.keel@intel.com> [Ported to 3.7 and tided for checkpatch etc] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* goldfish: audio supportAlan Cox2013-01-244-0/+376
(remove change to another file that escaped into the patch set) From: Mike Lockwood <lockwood@google.com> Provide a simple audio channel between the kernel and the emulator that host sit. Queued for staging right now as this ought to be an ALSA driver not just a dumb device of its own making. Signed-off-by: Mike A. Chan <mikechan@google.com> [x86 support] Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com> Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> [Clean up] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>