diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-20 14:49:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-20 14:49:56 -0800 |
| commit | 9097a058d49e049925d8da72db07fffcee24efa0 (patch) | |
| tree | 7fdc7d1ad2be05e7807c57cb680cd73f4a3c1f7f | |
| parent | f57b620a89ad2eee2e25218b5cb2bee0ad1e2e7d (diff) | |
| parent | 32774a8153b4c62e408297fba352248afb2e0143 (diff) | |
| download | linux-9097a058d49e049925d8da72db07fffcee24efa0.tar.bz2 | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"I2C has a MAINTAINERS update for you, so people will be immediately
pointed to the right person for this previously orphaned driver.
And one of Arnd's build warning fixes for a new driver added this
cycle"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: nvidia-gpu: mark resume function as __maybe_unused
MAINTAINERS: add entry for i2c-axxia driver
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-nvidia-gpu.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 21ce79908418..842b697a1511 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2633,6 +2633,13 @@ S: Maintained F: Documentation/devicetree/bindings/sound/axentia,* F: sound/soc/atmel/tse850-pcm5142.c +AXXIA I2C CONTROLLER +M: Krzysztof Adamski <krzysztof.adamski@nokia.com> +L: linux-i2c@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/i2c/i2c-axxia.txt +F: drivers/i2c/busses/i2c-axxia.c + AZ6007 DVB DRIVER M: Mauro Carvalho Chehab <mchehab@kernel.org> L: linux-media@vger.kernel.org diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index e99c3bb58351..4e67d5ed480e 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -342,7 +342,7 @@ static void gpu_i2c_remove(struct pci_dev *pdev) pci_free_irq_vectors(pdev); } -static int gpu_i2c_resume(struct device *dev) +static __maybe_unused int gpu_i2c_resume(struct device *dev) { struct gpu_i2c_dev *i2cd = dev_get_drvdata(dev); |