From ecf1dbac78a41c6a5b948f1a50960cde1ec362d1 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Thu, 10 Apr 2014 01:30:05 +0200 Subject: dma-buf: fix trivial typo error Signed-off-by: Javier Martinez Canillas Signed-off-by: Jiri Kosina --- drivers/base/dma-buf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index ea77701deda4..840c7fa80983 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -491,7 +491,7 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap); * dma-buf buffer. * * This function adjusts the passed in vma so that it points at the file of the - * dma_buf operation. It alsog adjusts the starting pgoff and does bounds + * dma_buf operation. It also adjusts the starting pgoff and does bounds * checking on the size of the vma. Then it calls the exporters mmap function to * set up the mapping. * -- cgit v1.2.3-55-g7522 From 07656d83085dfd3d5eff5d588a6f50c35c853ee0 Mon Sep 17 00:00:00 2001 From: Ryan Desfosses Date: Fri, 11 Apr 2014 01:01:53 -0400 Subject: pci: change "foo* bar" to "foo *bar" change made to resolve following checkpatch message: drivers/pci/pci.c:109: ERROR: "foo* bar" should be "foo *bar" branch: Linux 3.14-rc8 Signed-off-by: Ryan Desfosses Signed-off-by: Jiri Kosina --- drivers/pci/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7325d43bf030..9b26c192f327 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -106,7 +106,7 @@ static bool pcie_ari_disabled; * Given a PCI bus, returns the highest PCI bus number present in the set * including the given PCI bus and its list of child PCI buses. */ -unsigned char pci_bus_max_busnr(struct pci_bus* bus) +unsigned char pci_bus_max_busnr(struct pci_bus *bus) { struct pci_bus *tmp; unsigned char max, n; @@ -1371,7 +1371,7 @@ static void pcim_release(struct device *gendev, void *res) pci_disable_device(dev); } -static struct pci_devres * get_pci_dr(struct pci_dev *pdev) +static struct pci_devres *get_pci_dr(struct pci_dev *pdev) { struct pci_devres *dr, *new_dr; @@ -1385,7 +1385,7 @@ static struct pci_devres * get_pci_dr(struct pci_dev *pdev) return devres_get(&pdev->dev, new_dr, NULL, NULL); } -static struct pci_devres * find_pci_dr(struct pci_dev *pdev) +static struct pci_devres *find_pci_dr(struct pci_dev *pdev) { if (pci_is_managed(pdev)) return devres_find(&pdev->dev, pcim_release, NULL, NULL); -- cgit v1.2.3-55-g7522 From 43322faf5fc35df218c942742a577d5abe3eaac8 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Tue, 22 Apr 2014 15:57:26 +0300 Subject: radio-bcm2048.c: fix wrong overflow check This patch fixes an off by one check in bcm2048_set_region(). Reported-by: Dan Carpenter Signed-off-by: Pali Rohár Signed-off-by: Pavel Machek Signed-off-by: Dan Carpenter Signed-off-by: Jiri Kosina --- drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c index b2cd3a85166d..bbf236e842a9 100644 --- a/drivers/staging/media/bcm2048/radio-bcm2048.c +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c @@ -737,7 +737,7 @@ static int bcm2048_set_region(struct bcm2048_device *bdev, u8 region) int err; u32 new_frequency = 0; - if (region > ARRAY_SIZE(region_configs)) + if (region >= ARRAY_SIZE(region_configs)) return -EINVAL; mutex_lock(&bdev->mutex); -- cgit v1.2.3-55-g7522 From 9fca9acfc373cd7bcd193d2d669db49c0ebead38 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 11 Mar 2014 11:23:37 +0100 Subject: drm/exynos: Spelling s/contro/control/ Signed-off-by: Geert Uytterhoeven Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Jiri Kosina --- drivers/gpu/drm/exynos/exynos_drm_ipp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c index 09312b877470..3d78144387ac 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c @@ -284,7 +284,7 @@ static struct exynos_drm_ippdrv *ipp_find_drv_by_handle(u32 prop_id) /* * This case is search ipp driver by prop_id handle. * sometimes, ipp subsystem find driver by prop_id. - * e.g PAUSE state, queue buf, command contro. + * e.g PAUSE state, queue buf, command control. */ list_for_each_entry(ippdrv, &exynos_drm_ippdrv_list, drv_list) { DRM_DEBUG_KMS("count[%d]ippdrv[0x%x]\n", count++, (int)ippdrv); -- cgit v1.2.3-55-g7522 From 5a53a07f12da4377df8016ffc7fd465411cc1a7b Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 11 Mar 2014 11:23:38 +0100 Subject: of: Improve grammar for of_alias_get_id() documentation Signed-off-by: Geert Uytterhoeven Acked-by: Rob Herring Cc: Grant Likely Cc: devicetree@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/of/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/of/base.c b/drivers/of/base.c index 4557a142c752..ce1d3d8a0cd8 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2040,8 +2040,8 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) * @np: Pointer to the given device_node * @stem: Alias stem of the given device_node * - * The function travels the lookup table to get alias id for the given - * device_node and alias stem. It returns the alias id if find it. + * The function travels the lookup table to get the alias id for the given + * device_node and alias stem. It returns the alias id if found. */ int of_alias_get_id(struct device_node *np, const char *stem) { -- cgit v1.2.3-55-g7522 From 4d767759ff3caefb34e79fb7312d357f7c904f10 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 11 Mar 2014 11:23:46 +0100 Subject: ath6kl: Spelling s/determnine/determine/ Signed-off-by: Geert Uytterhoeven Cc: John W. Linville Cc: linux-wireless@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/net/wireless/ath/ath6kl/wmi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index b5f226503baf..5c702ae4d9f8 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.h +++ b/drivers/net/wireless/ath/ath6kl/wmi.h @@ -1068,7 +1068,7 @@ struct wmi_power_mode_cmd { } __packed; /* - * Policy to determnine whether power save failure event should be sent to + * Policy to determine whether power save failure event should be sent to * host during scanning */ enum power_save_fail_event_policy { -- cgit v1.2.3-55-g7522 From 8e4a4f5d3a8bffe6f1ada09a77fffa51bcd5750c Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 11 Mar 2014 11:23:45 +0100 Subject: ath10k: Improve grammar in comments Signed-off-by: Geert Uytterhoeven Cc: John W. Linville Cc: linux-wireless@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/net/wireless/ath/ath10k/wmi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index 4b5e7d3d32b6..8bce1113b753 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -1265,7 +1265,7 @@ struct wmi_resource_config { */ __le32 rx_decap_mode; - /* what is the maximum scan requests than can be queued */ + /* what is the maximum number of scan requests that can be queued */ __le32 scan_max_pending_reqs; /* maximum VDEV that could use BMISS offload */ @@ -1450,7 +1450,7 @@ struct wmi_resource_config_10x { */ __le32 rx_decap_mode; - /* what is the maximum scan requests than can be queued */ + /* what is the maximum number of scan requests that can be queued */ __le32 scan_max_pending_reqs; /* maximum VDEV that could use BMISS offload */ -- cgit v1.2.3-55-g7522 From 3cab65c46649361e17616333b23dbd2bbbed37b1 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 11 Mar 2014 11:23:49 +0100 Subject: aic7xxx: Spelling s/termnation/termination/ Signed-off-by: Geert Uytterhoeven Cc: James E.J. Bottomley Cc: linux-scsi@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/scsi/aic7xxx/aic79xx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h index 9b059422aacb..113874c1284b 100644 --- a/drivers/scsi/aic7xxx/aic79xx.h +++ b/drivers/scsi/aic7xxx/aic79xx.h @@ -911,7 +911,7 @@ struct vpd_config { uint8_t length; uint8_t revision; uint8_t device_flags; - uint8_t termnation_menus[2]; + uint8_t termination_menus[2]; uint8_t fifo_threshold; uint8_t end_tag; uint8_t vpd_checksum; -- cgit v1.2.3-55-g7522 From dd37a76c10a254ff6ae14cad5c898fa7c57330ff Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Sat, 24 May 2014 12:32:53 +0200 Subject: aic7xxx: Remove obsolete preprocessor define Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina --- drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'drivers') diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index c0c62583b542..114ff0c6e311 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c @@ -144,16 +144,6 @@ static struct scsi_transport_template *ahc_linux_transport_template = NULL; #define AIC7XXX_RESET_DELAY 5000 #endif -/* - * Control collection of SCSI transfer statistics for the /proc filesystem. - * - * NOTE: Do NOT enable this when running on kernels version 1.2.x and below. - * NOTE: This does affect performance since it has to maintain statistics. - */ -#ifdef CONFIG_AIC7XXX_PROC_STATS -#define AIC7XXX_PROC_STATS -#endif - /* * To change the default number of tagged transactions allowed per-device, * add a line to the lilo.conf file like: -- cgit v1.2.3-55-g7522 From 31789538e3ba7dd164e063d4978c96af1894be4c Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 26 May 2014 21:02:38 +0200 Subject: staging: go7007: remove reference to CONFIG_KMOD The Kconfig symbol KMOD was removed in v2.6.29. Remove CONFIG_KMOD from this list of options too. Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina --- drivers/staging/media/go7007/go7007.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers') diff --git a/drivers/staging/media/go7007/go7007.txt b/drivers/staging/media/go7007/go7007.txt index dc0026cff9f6..c8e5eb09d385 100644 --- a/drivers/staging/media/go7007/go7007.txt +++ b/drivers/staging/media/go7007/go7007.txt @@ -79,7 +79,6 @@ for custom-built kernels, the following options need to be enabled in the kernel as built-in or modules: CONFIG_MODULES - Enable loadable module support - CONFIG_KMOD - Automatic kernel module loading CONFIG_FW_LOADER - Hotplug firmware loading support CONFIG_I2C - I2C support CONFIG_VIDEO_DEV - Video For Linux -- cgit v1.2.3-55-g7522