summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-27misc: pch_phub: Fix Kconfig dependenciesJean Delvare
The pch_phub driver is for a companion chip to the Intel Atom E600 series processors. These are 32-bit x86 processors so the driver is only needed on X86_32. Add COMPILE_TEST as an alternative, so that the driver can still be build-tested elsewhere. Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove unused macros defined in osdep_service.hnavin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove unused inline function res_to_status()navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove inline function rtw_netif_stop_queue()navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove inline function rtw_netif_start_queue()navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove inline function rtw_netif_wake_queue()navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove unused variable struct adapter *pbuddy_padapternavin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove unused function rtw_handle_dualmac()navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Drop rtw_handle_dualmac() function calls in ↵navin patidar
rtw_usb_if1_deinit() rtw_usb_if1_init() assign NULL to pbuddy_padapter variable which is not being used. Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Drop rtw_handle_dualmac() function calls in ↵navin patidar
rtw_usb_if1_init() rtw_usb_if1_init() initializes pbuddy_padapter variable which is not being used. Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove unused function rtl8188eu_set_hw_type()navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove unused function chip_by_usb_id()navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Assign RTL8188E to padapter->chip_type directlynavin patidar
Assign RTL8188E to padapter->chip_type directly instead of calling chip_by_usb_id() function to do same. Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging:rtl8188eu:Remove code specific to kernel version < 2.6.35navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8188eu:Remove function rtw_set_tx_chksum_offload()navin patidar
rtw_set_tx_chksum_offload() has empty defination. Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27ARM: dts: omap3-n900: Add modem supportSebastian Reichel
Add modem device tree data to Nokia N900's DTS file. Signed-off-by: Sebastian Reichel <sre@kernel.org> Reviewed-by: Pavel Machek <pavel@ucw.cz> Tested-By: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-05-27ARM: dts: omap3-n900: Add SSI supportSebastian Reichel
Add SSI device tree data for OMAP3 and Nokia N900. Signed-off-by: Sebastian Reichel <sre@kernel.org> Reviewed-by: Pavel Machek <pavel@ucw.cz> Tested-By: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-05-27staging: rtl8821ae: stats.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: trx.h: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: trx.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: sw.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: regd.h: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: regd.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: rc.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: ps.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: pci.h: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: pci.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: efuse.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: debug.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: core.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: compat.h: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: cam.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8821ae: base.c: Remove version specific codeSachin Kamat
The code should be for the current kernel version. Remove conditional version based code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: comedi: remove in_request_moduleIan Abbott
The `in_request_module` member of `struct comedi_device` is only ever set to `false`, so remove the code that checks for it being `true` and remove the member. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8723au: Remove unneeded version.h inclusion in ioctl_cfg80211.cSachin Kamat
version.h inclusion is not needed as detected by versioncheck. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8723au: Remove unneeded version.h inclusion in os_intfs.cSachin Kamat
version.h inclusion is not needed as detected by versioncheck. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8723au: Remove unneeded version.h inclusion in osdep_service.hSachin Kamat
version.h inclusion is not needed as detected by versioncheck. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8192ee: Remove unneeded version.h inclusionSachin Kamat
version.h inclusion is not needed as detected by versioncheck. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8192ee: Fix build errorSachin Kamat
Fixes the followign build error: drivers/staging/rtl8192ee/btcoexist/halbtc8723b1ant.c:1387:6: error: called object is not a function or function pointer ("[BTCoex], Wifi non connected-idle + BT Busy!!\n")); Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8712: return -ENOMEM instead of -1Vitaly Osipov
After the commit 91d435f replaced _malloc with kmalloc, smatch picked up a couple of new warnings. This fixes the warning: warn: returning -1 instead of -ENOMEM is sloppy Signed-off-by: Vitaly Osipov <vitaly.osipov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27staging: rtl8712: fix kmalloc parametersVitaly Osipov
After the commit 91d435f replaced _malloc with kmalloc, smatch picked up a couple of new warnings. This fixes warnings: warn: struct type mismatch 'writePTM_parm vs setdig_parm' warn: struct type mismatch 'writePTM_parm vs setra_parm' The difference is u8 vs unsigned char. Signed-off-by: Vitaly Osipov <vitaly.osipov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27ARM: OMAP2+: Fix ssi hwmod entry to allow idlingTony Lindgren
The current entry prevents system from idling if the hwmod is defined in the .dts file so let's change the idlemodes. Note that we probably don't have SYSC_HAS_EMUFREE or SYSS_HAS_RESET_STATUS either. If we do, those can be added later on. Acked-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-05-27ARM: msm: Silence readb/writeb warnings due to missing IOMEM()Stephen Boyd
TROUT_CPLD_BASE needs the IOMEM() treatment to avoid warnings from the read/writeb functions. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-27PCI: Add new pci_is_bridge() interfaceYijing Wang
Add a helper function to check a device's header type for PCI bridge or CardBus bridge. Requires: 326c1cdae741 PCI: Rename pci_is_bridge() to pci_has_subordinate() Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2014-05-27Merge tag 'keystone-reset-driver' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers Merge "Keystone Reset driver for 3.16" from Santosh Shilimkar: * tag 'keystone-reset-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: power: reset: keystone-reset: introduce keystone reset driver Documentation: dt: add bindings for keystone pll control controller Documentation: dt: add bindings for keystone reset driver Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-27ARM: multi_v7_defconfig: Enable Zynq peripheral driversSoren Brinkmann
A few drivers for Zynq peripherals made it into mainline recently. Enable them in the defconfig. The following devices are enabled: - Cadence Macb Ethernet controller - Cadence I2C controller - Arasan SDHCI Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-27blk-mq: pass in suggested NUMA node to ->alloc_hctx()Jens Axboe
Drivers currently have to figure this out on their own, and they are missing information to do it properly. The ones that did attempt to do it, do it wrong. So just pass in the suggested node directly to the alloc function. Signed-off-by: Jens Axboe <axboe@fb.com>
2014-05-27MAINTAINERS: Add reset controller framework entryPhilipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-27PCI: Rename pci_is_bridge() to pci_has_subordinate()Yijing Wang
Previously, pci_is_bridge() returned true only when a subordinate bus existed. Rename pci_is_bridge() to pci_has_subordinate() to better indicate what we're checking. No functional change. [bhelgaas: changelog] Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2014-05-27NVMe: Implement PCIe reset notification callbackKeith Busch
Quiesce and shutdown the device prior to reset, then restart the device and resume IO after. Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>