提交 d14b7a41 编写于 作者: L Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree from Jiri Kosina:
 "Trivial updates all over the place as usual."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
  Fix typo in include/linux/clk.h .
  pci: hotplug: Fix typo in pci
  iommu: Fix typo in iommu
  video: Fix typo in drivers/video
  Documentation: Add newline at end-of-file to files lacking one
  arm,unicore32: Remove obsolete "select MISC_DEVICES"
  module.c: spelling s/postition/position/g
  cpufreq: Fix typo in cpufreq driver
  trivial: typo in comment in mksysmap
  mach-omap2: Fix typo in debug message and comment
  scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
  Change email address for Steve Glendinning
  Btrfs: fix typo in convert_extent_bit
  via: Remove bogus if check
  netprio_cgroup.c: fix comment typo
  backlight: fix memory leak on obscure error path
  Documentation: asus-laptop.txt references an obsolete Kconfig item
  Documentation: ManagementStyle: fixed typo
  mm/vmscan: cleanup comment error in balance_pgdat
  mm: cleanup on the comments of zone_reclaim_stat
  ...
...@@ -178,7 +178,7 @@ sadly that you are one too, and that while we can all bask in the secure ...@@ -178,7 +178,7 @@ sadly that you are one too, and that while we can all bask in the secure
knowledge that we're better than the average person (let's face it, knowledge that we're better than the average person (let's face it,
nobody ever believes that they're average or below-average), we should nobody ever believes that they're average or below-average), we should
also admit that we're not the sharpest knife around, and there will be also admit that we're not the sharpest knife around, and there will be
other people that are less of an idiot that you are. other people that are less of an idiot than you are.
Some people react badly to smart people. Others take advantage of them. Some people react badly to smart people. Others take advantage of them.
......
...@@ -2416,6 +2416,8 @@ Your cooperation is appreciated. ...@@ -2416,6 +2416,8 @@ Your cooperation is appreciated.
1 = /dev/raw/raw1 First raw I/O device 1 = /dev/raw/raw1 First raw I/O device
2 = /dev/raw/raw2 Second raw I/O device 2 = /dev/raw/raw2 Second raw I/O device
... ...
max minor number of raw device is set by kernel config
MAX_RAW_DEVS or raw module parameter 'max_raw_devs'
163 char 163 char
......
...@@ -151,8 +151,7 @@ Display switching ...@@ -151,8 +151,7 @@ Display switching
Debugging: Debugging:
1) Check whether the Fn+F8 key: 1) Check whether the Fn+F8 key:
a) does not lock the laptop (try disabling CONFIG_X86_UP_APIC or boot with a) does not lock the laptop (try a boot with noapic / nolapic if it does)
noapic / nolapic if it does)
b) generates events (0x6n, where n is the value corresponding to the b) generates events (0x6n, where n is the value corresponding to the
configuration above) configuration above)
c) actually works c) actually works
......
...@@ -6242,9 +6242,9 @@ F: Documentation/hwmon/smm665 ...@@ -6242,9 +6242,9 @@ F: Documentation/hwmon/smm665
F: drivers/hwmon/smm665.c F: drivers/hwmon/smm665.c
SMSC EMC2103 HARDWARE MONITOR DRIVER SMSC EMC2103 HARDWARE MONITOR DRIVER
M: Steve Glendinning <steve.glendinning@smsc.com> M: Steve Glendinning <steve.glendinning@shawell.net>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Supported S: Maintained
F: Documentation/hwmon/emc2103 F: Documentation/hwmon/emc2103
F: drivers/hwmon/emc2103.c F: drivers/hwmon/emc2103.c
...@@ -6263,22 +6263,22 @@ F: Documentation/hwmon/smsc47b397 ...@@ -6263,22 +6263,22 @@ F: Documentation/hwmon/smsc47b397
F: drivers/hwmon/smsc47b397.c F: drivers/hwmon/smsc47b397.c
SMSC911x ETHERNET DRIVER SMSC911x ETHERNET DRIVER
M: Steve Glendinning <steve.glendinning@smsc.com> M: Steve Glendinning <steve.glendinning@shawell.net>
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Supported S: Maintained
F: include/linux/smsc911x.h F: include/linux/smsc911x.h
F: drivers/net/ethernet/smsc/smsc911x.* F: drivers/net/ethernet/smsc/smsc911x.*
SMSC9420 PCI ETHERNET DRIVER SMSC9420 PCI ETHERNET DRIVER
M: Steve Glendinning <steve.glendinning@smsc.com> M: Steve Glendinning <steve.glendinning@shawell.net>
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Supported S: Maintained
F: drivers/net/ethernet/smsc/smsc9420.* F: drivers/net/ethernet/smsc/smsc9420.*
SMSC UFX6000 and UFX7000 USB to VGA DRIVER SMSC UFX6000 and UFX7000 USB to VGA DRIVER
M: Steve Glendinning <steve.glendinning@smsc.com> M: Steve Glendinning <steve.glendinning@shawell.net>
L: linux-fbdev@vger.kernel.org L: linux-fbdev@vger.kernel.org
S: Supported S: Maintained
F: drivers/video/smscufx.c F: drivers/video/smscufx.c
SN-IA64 (Itanium) SUB-PLATFORM SN-IA64 (Itanium) SUB-PLATFORM
...@@ -7232,9 +7232,9 @@ S: Supported ...@@ -7232,9 +7232,9 @@ S: Supported
F: drivers/usb/serial/whiteheat* F: drivers/usb/serial/whiteheat*
USB SMSC95XX ETHERNET DRIVER USB SMSC95XX ETHERNET DRIVER
M: Steve Glendinning <steve.glendinning@smsc.com> M: Steve Glendinning <steve.glendinning@shawell.net>
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Supported S: Maintained
F: drivers/net/usb/smsc95xx.* F: drivers/net/usb/smsc95xx.*
USB SN9C1xx DRIVER USB SN9C1xx DRIVER
......
...@@ -62,7 +62,6 @@ config MACH_DAVINCI_EVM ...@@ -62,7 +62,6 @@ config MACH_DAVINCI_EVM
bool "TI DM644x EVM" bool "TI DM644x EVM"
default ARCH_DAVINCI_DM644x default ARCH_DAVINCI_DM644x
depends on ARCH_DAVINCI_DM644x depends on ARCH_DAVINCI_DM644x
select MISC_DEVICES
select EEPROM_AT24 select EEPROM_AT24
select I2C select I2C
help help
...@@ -72,7 +71,6 @@ config MACH_DAVINCI_EVM ...@@ -72,7 +71,6 @@ config MACH_DAVINCI_EVM
config MACH_SFFSDR config MACH_SFFSDR
bool "Lyrtech SFFSDR" bool "Lyrtech SFFSDR"
depends on ARCH_DAVINCI_DM644x depends on ARCH_DAVINCI_DM644x
select MISC_DEVICES
select EEPROM_AT24 select EEPROM_AT24
select I2C select I2C
help help
...@@ -106,7 +104,6 @@ config MACH_DAVINCI_DM6467_EVM ...@@ -106,7 +104,6 @@ config MACH_DAVINCI_DM6467_EVM
default ARCH_DAVINCI_DM646x default ARCH_DAVINCI_DM646x
depends on ARCH_DAVINCI_DM646x depends on ARCH_DAVINCI_DM646x
select MACH_DAVINCI_DM6467TEVM select MACH_DAVINCI_DM6467TEVM
select MISC_DEVICES
select EEPROM_AT24 select EEPROM_AT24
select I2C select I2C
help help
...@@ -120,7 +117,6 @@ config MACH_DAVINCI_DM365_EVM ...@@ -120,7 +117,6 @@ config MACH_DAVINCI_DM365_EVM
bool "TI DM365 EVM" bool "TI DM365 EVM"
default ARCH_DAVINCI_DM365 default ARCH_DAVINCI_DM365
depends on ARCH_DAVINCI_DM365 depends on ARCH_DAVINCI_DM365
select MISC_DEVICES
select EEPROM_AT24 select EEPROM_AT24
select I2C select I2C
help help
...@@ -132,7 +128,6 @@ config MACH_DAVINCI_DA830_EVM ...@@ -132,7 +128,6 @@ config MACH_DAVINCI_DA830_EVM
default ARCH_DAVINCI_DA830 default ARCH_DAVINCI_DA830
depends on ARCH_DAVINCI_DA830 depends on ARCH_DAVINCI_DA830
select GPIO_PCF857X select GPIO_PCF857X
select MISC_DEVICES
select EEPROM_AT24 select EEPROM_AT24
select I2C select I2C
help help
...@@ -219,7 +214,6 @@ config MACH_TNETV107X ...@@ -219,7 +214,6 @@ config MACH_TNETV107X
config MACH_MITYOMAPL138 config MACH_MITYOMAPL138
bool "Critical Link MityDSP-L138/MityARM-1808 SoM" bool "Critical Link MityDSP-L138/MityARM-1808 SoM"
depends on ARCH_DAVINCI_DA850 depends on ARCH_DAVINCI_DA850
select MISC_DEVICES
select EEPROM_AT24 select EEPROM_AT24
select I2C select I2C
help help
......
...@@ -311,7 +311,7 @@ static void __init omap_apollon_init(void) ...@@ -311,7 +311,7 @@ static void __init omap_apollon_init(void)
/* LCD PWR_EN */ /* LCD PWR_EN */
omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP); omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP);
/* Use Interal loop-back in MMC/SDIO Module Input Clock selection */ /* Use Internal loop-back in MMC/SDIO Module Input Clock selection */
v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
v |= (1 << 24); v |= (1 << 24);
omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
......
...@@ -106,7 +106,7 @@ static struct platform_device leds_gpio = { ...@@ -106,7 +106,7 @@ static struct platform_device leds_gpio = {
static struct omap_abe_twl6040_data panda_abe_audio_data = { static struct omap_abe_twl6040_data panda_abe_audio_data = {
/* Audio out */ /* Audio out */
.has_hs = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, .has_hs = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
/* HandsFree through expasion connector */ /* HandsFree through expansion connector */
.has_hf = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, .has_hf = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
/* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */ /* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */
.has_aux = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, .has_aux = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
......
...@@ -313,7 +313,7 @@ int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state) ...@@ -313,7 +313,7 @@ int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
scu_pwrst_prepare(cpu, power_state); scu_pwrst_prepare(cpu, power_state);
/* /*
* CPU never retuns back if targetted power state is OFF mode. * CPU never retuns back if targeted power state is OFF mode.
* CPU ONLINE follows normal CPU ONLINE ptah via * CPU ONLINE follows normal CPU ONLINE ptah via
* omap_secondary_startup(). * omap_secondary_startup().
*/ */
......
...@@ -131,7 +131,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) ...@@ -131,7 +131,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user)
omap_voltage_get_volttable(sr_data->voltdm, &volt_data); omap_voltage_get_volttable(sr_data->voltdm, &volt_data);
if (!volt_data) { if (!volt_data) {
pr_warning("%s: No Voltage table registerd fo VDD%d." pr_warning("%s: No Voltage table registered fo VDD%d."
"Something really wrong\n\n", __func__, i + 1); "Something really wrong\n\n", __func__, i + 1);
goto exit; goto exit;
} }
......
...@@ -96,7 +96,7 @@ void __init omap4_pmic_init(const char *pmic_type, ...@@ -96,7 +96,7 @@ void __init omap4_pmic_init(const char *pmic_type,
void __init omap_pmic_late_init(void) void __init omap_pmic_late_init(void)
{ {
/* Init the OMAP TWL parameters (if PMIC has been registerd) */ /* Init the OMAP TWL parameters (if PMIC has been registered) */
if (pmic_i2c_board_info.irq) if (pmic_i2c_board_info.irq)
omap3_twl_init(); omap3_twl_init();
if (omap4_i2c1_board_info[0].irq) if (omap4_i2c1_board_info[0].irq)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#ifndef __PLAT_GPIO_CFG_H #ifndef __PLAT_GPIO_CFG_H
#define __PLAT_GPIO_CFG_H __FILE__ #define __PLAT_GPIO_CFG_H __FILE__
#include<linux/types.h> #include <linux/types.h>
typedef unsigned int __bitwise__ samsung_gpio_pull_t; typedef unsigned int __bitwise__ samsung_gpio_pull_t;
typedef unsigned int __bitwise__ s5p_gpio_drvstr_t; typedef unsigned int __bitwise__ s5p_gpio_drvstr_t;
......
...@@ -12,7 +12,7 @@ EXPORT_SYMBOL(memset); ...@@ -12,7 +12,7 @@ EXPORT_SYMBOL(memset);
EXPORT_SYMBOL(memcpy); EXPORT_SYMBOL(memcpy);
EXPORT_SYMBOL(strlen); EXPORT_SYMBOL(strlen);
#include<asm/pgtable.h> #include <asm/pgtable.h>
EXPORT_SYMBOL_GPL(empty_zero_page); EXPORT_SYMBOL_GPL(empty_zero_page);
#include <asm/checksum.h> #include <asm/checksum.h>
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
*/ */
#include<linux/kernel.h> #include <linux/kernel.h>
#include<linux/module.h> #include <linux/module.h>
#include<asm/fpswa.h> #include <asm/fpswa.h>
#include "vcpu.h" #include "vcpu.h"
......
...@@ -47,7 +47,7 @@ int apply_relocate(Elf32_Shdr *sechdrs, ...@@ -47,7 +47,7 @@ int apply_relocate(Elf32_Shdr *sechdrs,
*location += sym->st_value; *location += sym->st_value;
break; break;
case R_68K_PC32: case R_68K_PC32:
/* Add the value, subtract its postition */ /* Add the value, subtract its position */
*location += sym->st_value - (uint32_t)location; *location += sym->st_value - (uint32_t)location;
break; break;
default: default:
...@@ -87,7 +87,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, ...@@ -87,7 +87,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
*location = rel[i].r_addend + sym->st_value; *location = rel[i].r_addend + sym->st_value;
break; break;
case R_68K_PC32: case R_68K_PC32:
/* Add the value, subtract its postition */ /* Add the value, subtract its position */
*location = rel[i].r_addend + sym->st_value - (uint32_t)location; *location = rel[i].r_addend + sym->st_value - (uint32_t)location;
break; break;
default: default:
......
#include<linux/compat.h> #include <linux/compat.h>
#include<linux/compat_siginfo.h> #include <linux/compat_siginfo.h>
#include<asm/compat_ucontext.h> #include <asm/compat_ucontext.h>
#ifndef _ASM_PARISC_COMPAT_RT_SIGFRAME_H #ifndef _ASM_PARISC_COMPAT_RT_SIGFRAME_H
#define _ASM_PARISC_COMPAT_RT_SIGFRAME_H #define _ASM_PARISC_COMPAT_RT_SIGFRAME_H
......
/* /*
* June 2006 steve.glendinning@smsc.com * June 2006 Steve Glendinning <steve.glendinning@shawell.net>
* *
* Polaris-specific resource declaration * Polaris-specific resource declaration
* *
......
...@@ -238,7 +238,6 @@ config I2C_BATTERY_BQ27200 ...@@ -238,7 +238,6 @@ config I2C_BATTERY_BQ27200
config I2C_EEPROM_AT24 config I2C_EEPROM_AT24
tristate "I2C EEPROMs AT24 support" tristate "I2C EEPROMs AT24 support"
select I2C_PUV3 select I2C_PUV3
select MISC_DEVICES
select EEPROM_AT24 select EEPROM_AT24
config LCD_BACKLIGHT config LCD_BACKLIGHT
......
...@@ -81,7 +81,7 @@ int apply_relocate(Elf32_Shdr *sechdrs, ...@@ -81,7 +81,7 @@ int apply_relocate(Elf32_Shdr *sechdrs,
*location += sym->st_value; *location += sym->st_value;
break; break;
case R_386_PC32: case R_386_PC32:
/* Add the value, subtract its postition */ /* Add the value, subtract its position */
*location += sym->st_value - (uint32_t)location; *location += sym->st_value - (uint32_t)location;
break; break;
default: default:
......
...@@ -153,7 +153,7 @@ static int s3c2416_cpufreq_enter_dvs(struct s3c2416_data *s3c_freq, int idx) ...@@ -153,7 +153,7 @@ static int s3c2416_cpufreq_enter_dvs(struct s3c2416_data *s3c_freq, int idx)
if (s3c_freq->vddarm) { if (s3c_freq->vddarm) {
dvfs = &s3c2416_dvfs_table[idx]; dvfs = &s3c2416_dvfs_table[idx];
pr_debug("cpufreq: setting regultor to %d-%d\n", pr_debug("cpufreq: setting regulator to %d-%d\n",
dvfs->vddarm_min, dvfs->vddarm_max); dvfs->vddarm_min, dvfs->vddarm_max);
ret = regulator_set_voltage(s3c_freq->vddarm, ret = regulator_set_voltage(s3c_freq->vddarm,
dvfs->vddarm_min, dvfs->vddarm_min,
...@@ -186,7 +186,7 @@ static int s3c2416_cpufreq_leave_dvs(struct s3c2416_data *s3c_freq, int idx) ...@@ -186,7 +186,7 @@ static int s3c2416_cpufreq_leave_dvs(struct s3c2416_data *s3c_freq, int idx)
if (s3c_freq->vddarm) { if (s3c_freq->vddarm) {
dvfs = &s3c2416_dvfs_table[idx]; dvfs = &s3c2416_dvfs_table[idx];
pr_debug("cpufreq: setting regultor to %d-%d\n", pr_debug("cpufreq: setting regulator to %d-%d\n",
dvfs->vddarm_min, dvfs->vddarm_max); dvfs->vddarm_min, dvfs->vddarm_max);
ret = regulator_set_voltage(s3c_freq->vddarm, ret = regulator_set_voltage(s3c_freq->vddarm,
dvfs->vddarm_min, dvfs->vddarm_min,
......
...@@ -203,7 +203,7 @@ static unsigned int speedstep_detect_chipset(void) ...@@ -203,7 +203,7 @@ static unsigned int speedstep_detect_chipset(void)
if (speedstep_chipset_dev) { if (speedstep_chipset_dev) {
/* speedstep.c causes lockups on Dell Inspirons 8000 and /* speedstep.c causes lockups on Dell Inspirons 8000 and
* 8100 which use a pretty old revision of the 82815 * 8100 which use a pretty old revision of the 82815
* host brige. Abort on these systems. * host bridge. Abort on these systems.
*/ */
static struct pci_dev *hostbridge; static struct pci_dev *hostbridge;
......
...@@ -732,6 +732,6 @@ static struct i2c_driver emc2103_driver = { ...@@ -732,6 +732,6 @@ static struct i2c_driver emc2103_driver = {
module_i2c_driver(emc2103_driver); module_i2c_driver(emc2103_driver);
MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>");
MODULE_DESCRIPTION("SMSC EMC2103 hwmon driver"); MODULE_DESCRIPTION("SMSC EMC2103 hwmon driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -91,7 +91,7 @@ static void lm8333_key_handler(struct lm8333 *lm8333) ...@@ -91,7 +91,7 @@ static void lm8333_key_handler(struct lm8333 *lm8333)
return; return;
} }
for (i = 0; keys[i] && i < LM8333_FIFO_TRANSFER_SIZE; i++) { for (i = 0; i < LM8333_FIFO_TRANSFER_SIZE && keys[i]; i++) {
pressed = keys[i] & 0x80; pressed = keys[i] & 0x80;
code = keys[i] & 0x7f; code = keys[i] & 0x7f;
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
/* /*
* Bit weights in mg for bit 0, other bits need * Bit weights in mg for bit 0, other bits need
* multipy factor 2^n. Eight bit is the sign bit. * multiply factor 2^n. Eight bit is the sign bit.
*/ */
#define BIT_TO_2G 18 #define BIT_TO_2G 18
#define BIT_TO_8G 71 #define BIT_TO_8G 71
......
...@@ -924,7 +924,7 @@ static int __init amd_iommu_v2_init(void) ...@@ -924,7 +924,7 @@ static int __init amd_iommu_v2_init(void)
pr_info("AMD IOMMUv2 driver by Joerg Roedel <joerg.roedel@amd.com>\n"); pr_info("AMD IOMMUv2 driver by Joerg Roedel <joerg.roedel@amd.com>\n");
if (!amd_iommu_v2_supported()) { if (!amd_iommu_v2_supported()) {
pr_info("AMD IOMMUv2 functionality not available on this sytem\n"); pr_info("AMD IOMMUv2 functionality not available on this system\n");
/* /*
* Load anyway to provide the symbols to other modules * Load anyway to provide the symbols to other modules
* which may use AMD IOMMUv2 optionally. * which may use AMD IOMMUv2 optionally.
......
...@@ -317,7 +317,7 @@ static int default_fault_handler(enum exynos_sysmmu_inttype itype, ...@@ -317,7 +317,7 @@ static int default_fault_handler(enum exynos_sysmmu_inttype itype,
if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT)) if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT))
itype = SYSMMU_FAULT_UNKNOWN; itype = SYSMMU_FAULT_UNKNOWN;
pr_err("%s occured at 0x%lx(Page table base: 0x%lx)\n", pr_err("%s occurred at 0x%lx(Page table base: 0x%lx)\n",
sysmmu_fault_name[itype], fault_addr, pgtable_base); sysmmu_fault_name[itype], fault_addr, pgtable_base);
ent = section_entry(__va(pgtable_base), fault_addr); ent = section_entry(__va(pgtable_base), fault_addr);
......
...@@ -198,10 +198,10 @@ iova_insert_rbtree(struct rb_root *root, struct iova *iova) ...@@ -198,10 +198,10 @@ iova_insert_rbtree(struct rb_root *root, struct iova *iova)
/** /**
* alloc_iova - allocates an iova * alloc_iova - allocates an iova
* @iovad - iova domain in question * @iovad: - iova domain in question
* @size - size of page frames to allocate * @size: - size of page frames to allocate
* @limit_pfn - max limit address * @limit_pfn: - max limit address
* @size_aligned - set if size_aligned address range is required * @size_aligned: - set if size_aligned address range is required
* This function allocates an iova in the range limit_pfn to IOVA_START_PFN * This function allocates an iova in the range limit_pfn to IOVA_START_PFN
* looking from limit_pfn instead from IOVA_START_PFN. If the size_aligned * looking from limit_pfn instead from IOVA_START_PFN. If the size_aligned
* flag is set then the allocated address iova->pfn_lo will be naturally * flag is set then the allocated address iova->pfn_lo will be naturally
...@@ -238,8 +238,8 @@ alloc_iova(struct iova_domain *iovad, unsigned long size, ...@@ -238,8 +238,8 @@ alloc_iova(struct iova_domain *iovad, unsigned long size,
/** /**
* find_iova - find's an iova for a given pfn * find_iova - find's an iova for a given pfn
* @iovad - iova domain in question. * @iovad: - iova domain in question.
* pfn - page frame number * @pfn: - page frame number
* This function finds and returns an iova belonging to the * This function finds and returns an iova belonging to the
* given doamin which matches the given pfn. * given doamin which matches the given pfn.
*/ */
...@@ -260,7 +260,7 @@ struct iova *find_iova(struct iova_domain *iovad, unsigned long pfn) ...@@ -260,7 +260,7 @@ struct iova *find_iova(struct iova_domain *iovad, unsigned long pfn)
/* We are not holding the lock while this iova /* We are not holding the lock while this iova
* is referenced by the caller as the same thread * is referenced by the caller as the same thread
* which called this function also calls __free_iova() * which called this function also calls __free_iova()
* and it is by desing that only one thread can possibly * and it is by design that only one thread can possibly
* reference a particular iova and hence no conflict. * reference a particular iova and hence no conflict.
*/ */
return iova; return iova;
......
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
/* v4l API */ /* v4l API */
/* headerfile of this module */ /* headerfile of this module */
#include"zr36016.h" #include "zr36016.h"
/* codec io API */ /* codec io API */
#include"videocodec.h" #include "videocodec.h"
/* it doesn't make sense to have more than 20 or so, /* it doesn't make sense to have more than 20 or so,
just to prevent some unwanted loops */ just to prevent some unwanted loops */
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
* *
* Support added for SMSC LAN8187 and LAN8700 by steve.glendinning@smsc.com * Support added for SMSC LAN8187 and LAN8700 by steve.glendinning@shawell.net
* *
*/ */
......
...@@ -1260,6 +1260,6 @@ static struct usb_driver smsc75xx_driver = { ...@@ -1260,6 +1260,6 @@ static struct usb_driver smsc75xx_driver = {
module_usb_driver(smsc75xx_driver); module_usb_driver(smsc75xx_driver);
MODULE_AUTHOR("Nancy Lin"); MODULE_AUTHOR("Nancy Lin");
MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>");
MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices"); MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -1335,6 +1335,6 @@ static struct usb_driver smsc95xx_driver = { ...@@ -1335,6 +1335,6 @@ static struct usb_driver smsc95xx_driver = {
module_usb_driver(smsc95xx_driver); module_usb_driver(smsc95xx_driver);
MODULE_AUTHOR("Nancy Lin"); MODULE_AUTHOR("Nancy Lin");
MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>");
MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices"); MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <linux/export.h> #include <linux/export.h>
#include "iwl-io.h" #include "iwl-io.h"
#include"iwl-csr.h" #include "iwl-csr.h"
#include "iwl-debug.h" #include "iwl-debug.h"
#define IWL_POLL_INTERVAL 10 /* microseconds */ #define IWL_POLL_INTERVAL 10 /* microseconds */
......
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
#endif #endif
#include <asm/ropes.h> #include <asm/ropes.h>
#include "./iosapic_private.h" #include "iosapic_private.h"
#define MODULE_NAME "iosapic" #define MODULE_NAME "iosapic"
......
...@@ -760,7 +760,7 @@ static u8 bus_structure_fixup(u8 busno) ...@@ -760,7 +760,7 @@ static u8 bus_structure_fixup(u8 busno)
for (dev->devfn = 0; dev->devfn < 256; dev->devfn += 8) { for (dev->devfn = 0; dev->devfn < 256; dev->devfn += 8) {
if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) && if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) &&
(l != 0x0000) && (l != 0xffff)) { (l != 0x0000) && (l != 0xffff)) {
debug("%s - Inside bus_struture_fixup()\n", debug("%s - Inside bus_structure_fixup()\n",
__func__); __func__);
pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL); pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL);
break; break;
......
...@@ -784,7 +784,7 @@ static int __init ebda_rsrc_controller (void) ...@@ -784,7 +784,7 @@ static int __init ebda_rsrc_controller (void)
hpc_ptr->ctlr_relative_id = ctlr; hpc_ptr->ctlr_relative_id = ctlr;
hpc_ptr->slot_count = slot_num; hpc_ptr->slot_count = slot_num;
hpc_ptr->bus_count = bus_num; hpc_ptr->bus_count = bus_num;
debug ("now enter ctlr data struture ---\n"); debug ("now enter ctlr data structure ---\n");
debug ("ctlr id: %x\n", ctlr_id); debug ("ctlr id: %x\n", ctlr_id);
debug ("ctlr_relative_id: %x\n", hpc_ptr->ctlr_relative_id); debug ("ctlr_relative_id: %x\n", hpc_ptr->ctlr_relative_id);
debug ("count of slots controlled by this ctlr: %x\n", slot_num); debug ("count of slots controlled by this ctlr: %x\n", slot_num);
......
...@@ -109,7 +109,7 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno) ...@@ -109,7 +109,7 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno)
cur_func->function = function; cur_func->function = function;
debug ("inside the loop, cur_func->busno = %x, cur_func->device = %x, cur_func->funcion = %x\n", debug ("inside the loop, cur_func->busno = %x, cur_func->device = %x, cur_func->function = %x\n",
cur_func->busno, cur_func->device, cur_func->function); cur_func->busno, cur_func->device, cur_func->function);
pci_bus_read_config_word (ibmphp_pci_bus, devfn, PCI_VENDOR_ID, &vendor_id); pci_bus_read_config_word (ibmphp_pci_bus, devfn, PCI_VENDOR_ID, &vendor_id);
......
...@@ -308,7 +308,7 @@ static void __assign_resources_sorted(struct list_head *head, ...@@ -308,7 +308,7 @@ static void __assign_resources_sorted(struct list_head *head,
* Should not assign requested resources at first. * Should not assign requested resources at first.
* they could be adjacent, so later reassign can not reallocate * they could be adjacent, so later reassign can not reallocate
* them one by one in parent resource window. * them one by one in parent resource window.
* Try to assign requested + add_size at begining * Try to assign requested + add_size at beginning
* if could do that, could get out early. * if could do that, could get out early.
* if could not do that, we still try to assign requested at first, * if could not do that, we still try to assign requested at first,
* then try to reassign add_size for some resources. * then try to reassign add_size for some resources.
......
...@@ -301,7 +301,7 @@ config AB8500_BM ...@@ -301,7 +301,7 @@ config AB8500_BM
bool "AB8500 Battery Management Driver" bool "AB8500 Battery Management Driver"
depends on AB8500_CORE && AB8500_GPADC depends on AB8500_CORE && AB8500_GPADC
help help
Say Y to include support for AB5500 battery management. Say Y to include support for AB8500 battery management.
config AB8500_BATTERY_THERM_ON_BATCTRL config AB8500_BATTERY_THERM_ON_BATCTRL
bool "Thermistor connected on BATCTRL ADC" bool "Thermistor connected on BATCTRL ADC"
......
...@@ -2984,8 +2984,8 @@ static int get_command(char *pos, Scsi_Cmnd * ptr) ...@@ -2984,8 +2984,8 @@ static int get_command(char *pos, Scsi_Cmnd * ptr)
char *start = pos; char *start = pos;
int i; int i;
SPRINTF("0x%08x: target=%d; lun=%d; cmnd=( ", SPRINTF("%p: target=%d; lun=%d; cmnd=( ",
(unsigned int) ptr, ptr->device->id, ptr->device->lun); ptr, ptr->device->id, ptr->device->lun);
for (i = 0; i < COMMAND_SIZE(ptr->cmnd[0]); i++) for (i = 0; i < COMMAND_SIZE(ptr->cmnd[0]); i++)
SPRINTF("0x%02x ", ptr->cmnd[i]); SPRINTF("0x%02x ", ptr->cmnd[i]);
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#define SCSI_BUF_PA(address) isa_virt_to_bus(address) #define SCSI_BUF_PA(address) isa_virt_to_bus(address)
#define SCSI_SG_PA(sgent) (isa_page_to_bus(sg_page((sgent))) + (sgent)->offset) #define SCSI_SG_PA(sgent) (isa_page_to_bus(sg_page((sgent))) + (sgent)->offset)
#include<linux/stat.h> #include <linux/stat.h>
#ifdef DEBUG #ifdef DEBUG
#define DEB(x) x #define DEB(x) x
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
#define INLINE static __inline #define INLINE static __inline
#endif #endif
#include<linux/slab.h> #include <linux/slab.h>
#define S626_SIZE 0x0200 #define S626_SIZE 0x0200
#define SIZEOF_ADDRESS_SPACE 0x0200 #define SIZEOF_ADDRESS_SPACE 0x0200
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include "./common.h" #include "common.h"
/* /*
* image of renesas_usbhs * image of renesas_usbhs
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
struct usbhs_priv; struct usbhs_priv;
#include "./mod.h" #include "mod.h"
#include "./pipe.h" #include "pipe.h"
/* /*
* *
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include "./common.h" #include "common.h"
#include "./pipe.h" #include "pipe.h"
#define usbhsf_get_cfifo(p) (&((p)->fifo_info.cfifo)) #define usbhsf_get_cfifo(p) (&((p)->fifo_info.cfifo))
#define usbhsf_get_d0fifo(p) (&((p)->fifo_info.d0fifo)) #define usbhsf_get_d0fifo(p) (&((p)->fifo_info.d0fifo))
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "./common.h" #include "common.h"
#include "./mod.h" #include "mod.h"
#define usbhs_priv_to_modinfo(priv) (&priv->mod_info) #define usbhs_priv_to_modinfo(priv) (&priv->mod_info)
#define usbhs_mod_info_call(priv, func, param...) \ #define usbhs_mod_info_call(priv, func, param...) \
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/usb/renesas_usbhs.h> #include <linux/usb/renesas_usbhs.h>
#include "./common.h" #include "common.h"
/* /*
* struct * struct
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "./common.h" #include "common.h"
#include "./pipe.h" #include "pipe.h"
/* /*
* macros * macros
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#ifndef RENESAS_USB_PIPE_H #ifndef RENESAS_USB_PIPE_H
#define RENESAS_USB_PIPE_H #define RENESAS_USB_PIPE_H
#include "./common.h" #include "common.h"
#include "./fifo.h" #include "fifo.h"
/* /*
* struct * struct
......
...@@ -336,8 +336,8 @@ static void arcfb_lcd_update_horiz(struct arcfb_par *par, unsigned int left, ...@@ -336,8 +336,8 @@ static void arcfb_lcd_update_horiz(struct arcfb_par *par, unsigned int left,
} }
/* /*
* here we start the process of spliting out the fb update into * here we start the process of splitting out the fb update into
* individual blocks of pixels. we end up spliting into 64x64 blocks * individual blocks of pixels. we end up splitting into 64x64 blocks
* and finally down to 64x8 pages. * and finally down to 64x8 pages.
*/ */
static void arcfb_lcd_update(struct arcfb_par *par, unsigned int dx, static void arcfb_lcd_update(struct arcfb_par *par, unsigned int dx,
......
...@@ -939,7 +939,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) ...@@ -939,7 +939,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
* up a splash image. * up a splash image.
*/ */
} else { } else {
/* alocate memory buffer */ /* allocate memory buffer */
ret = atmel_lcdfb_alloc_video_memory(sinfo); ret = atmel_lcdfb_alloc_video_memory(sinfo);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "cannot allocate framebuffer: %d\n", ret); dev_err(dev, "cannot allocate framebuffer: %d\n", ret);
......
...@@ -863,7 +863,7 @@ static int aty_var_to_crtc(const struct fb_info *info, ...@@ -863,7 +863,7 @@ static int aty_var_to_crtc(const struct fb_info *info,
if ((xres > 1600) || (yres > 1200)) { if ((xres > 1600) || (yres > 1200)) {
FAIL("MACH64 chips are designed for max 1600x1200\n" FAIL("MACH64 chips are designed for max 1600x1200\n"
"select anoter resolution."); "select another resolution.");
} }
h_sync_strt = h_disp + var->right_margin; h_sync_strt = h_disp + var->right_margin;
h_sync_end = h_sync_strt + var->hsync_len; h_sync_end = h_sync_strt + var->hsync_len;
......
...@@ -2018,7 +2018,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) ...@@ -2018,7 +2018,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
if ((rinfo->family == CHIP_FAMILY_RS100) || if ((rinfo->family == CHIP_FAMILY_RS100) ||
(rinfo->family == CHIP_FAMILY_RS200)) { (rinfo->family == CHIP_FAMILY_RS200)) {
/* This is to workaround the asic bug for RMX, some versions /* This is to workaround the asic bug for RMX, some versions
of BIOS dosen't have this register initialized correctly. of BIOS doesn't have this register initialized correctly.
*/ */
OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN, OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN,
~CRTC_H_CUTOFF_ACTIVE_EN); ~CRTC_H_CUTOFF_ACTIVE_EN);
......
...@@ -228,6 +228,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev) ...@@ -228,6 +228,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
data->port = pdata->flags; data->port = pdata->flags;
if (data->port < 0) { if (data->port < 0) {
dev_err(&pdev->dev, "wrong platform data is assigned"); dev_err(&pdev->dev, "wrong platform data is assigned");
kfree(data);
return -EINVAL; return -EINVAL;
} }
......
...@@ -58,7 +58,7 @@ static const unsigned short ppi_pins[] = { ...@@ -58,7 +58,7 @@ static const unsigned short ppi_pins[] = {
*/ */
static struct bfin_adv7393_fb_par { static struct bfin_adv7393_fb_par {
/* structure holding blackfin / adv7393 paramters when /* structure holding blackfin / adv7393 parameters when
screen is blanked */ screen is blanked */
struct { struct {
u8 Mode; /* ntsc/pal/? */ u8 Mode; /* ntsc/pal/? */
......
...@@ -1611,7 +1611,7 @@ static void init_vgachip(struct fb_info *info) ...@@ -1611,7 +1611,7 @@ static void init_vgachip(struct fb_info *info)
/* ext. display controls: ext.adr. wrap */ /* ext. display controls: ext.adr. wrap */
vga_wcrt(cinfo->regbase, CL_CRT1B, 0x02); vga_wcrt(cinfo->regbase, CL_CRT1B, 0x02);
/* Set/Reset registes: - */ /* Set/Reset registers: - */
vga_wgfx(cinfo->regbase, VGA_GFX_SR_VALUE, 0x00); vga_wgfx(cinfo->regbase, VGA_GFX_SR_VALUE, 0x00);
/* Set/Reset enable: - */ /* Set/Reset enable: - */
vga_wgfx(cinfo->regbase, VGA_GFX_SR_ENABLE, 0x00); vga_wgfx(cinfo->regbase, VGA_GFX_SR_ENABLE, 0x00);
......
...@@ -752,7 +752,7 @@ int exynos_dp_read_bytes_from_i2c(struct exynos_dp_device *dp, ...@@ -752,7 +752,7 @@ int exynos_dp_read_bytes_from_i2c(struct exynos_dp_device *dp,
/* /*
* If Rx sends defer, Tx sends only reads * If Rx sends defer, Tx sends only reads
* request without sending addres * request without sending address
*/ */
if (!defer) if (!defer)
retval = exynos_dp_select_i2c_device(dp, retval = exynos_dp_select_i2c_device(dp,
......
...@@ -106,7 +106,7 @@ static void exynos_mipi_update_cfg(struct mipi_dsim_device *dsim) ...@@ -106,7 +106,7 @@ static void exynos_mipi_update_cfg(struct mipi_dsim_device *dsim)
/* /*
* data from Display controller(FIMD) is transferred in video mode * data from Display controller(FIMD) is transferred in video mode
* but in case of command mode, all settigs is updated to registers. * but in case of command mode, all settings are updated to registers.
*/ */
exynos_mipi_dsi_stand_by(dsim, 1); exynos_mipi_dsi_stand_by(dsim, 1);
} }
......
...@@ -497,7 +497,7 @@ static int i740fb_decode_var(const struct fb_var_screeninfo *var, ...@@ -497,7 +497,7 @@ static int i740fb_decode_var(const struct fb_var_screeninfo *var,
mem = vxres * vyres * ((bpp + 1) / 8); mem = vxres * vyres * ((bpp + 1) / 8);
if (mem > info->screen_size) { if (mem > info->screen_size) {
dev_err(info->device, "not enough video memory (%d KB requested, %ld KB avaliable)\n", dev_err(info->device, "not enough video memory (%d KB requested, %ld KB available)\n",
mem >> 10, info->screen_size >> 10); mem >> 10, info->screen_size >> 10);
return -ENOMEM; return -ENOMEM;
} }
...@@ -728,7 +728,7 @@ static void vga_protect(struct i740fb_par *par) ...@@ -728,7 +728,7 @@ static void vga_protect(struct i740fb_par *par)
i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0x20, 0x20); i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0x20, 0x20);
i740inb(par, 0x3DA); i740inb(par, 0x3DA);
i740outb(par, VGA_ATT_W, 0x00); /* enable pallete access */ i740outb(par, VGA_ATT_W, 0x00); /* enable palette access */
} }
static void vga_unprotect(struct i740fb_par *par) static void vga_unprotect(struct i740fb_par *par)
...@@ -737,7 +737,7 @@ static void vga_unprotect(struct i740fb_par *par) ...@@ -737,7 +737,7 @@ static void vga_unprotect(struct i740fb_par *par)
i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0, 0x20); i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0, 0x20);
i740inb(par, 0x3DA); i740inb(par, 0x3DA);
i740outb(par, VGA_ATT_W, 0x20); /* disable pallete access */ i740outb(par, VGA_ATT_W, 0x20); /* disable palette access */
} }
static int i740fb_set_par(struct fb_info *info) static int i740fb_set_par(struct fb_info *info)
......
...@@ -189,7 +189,7 @@ struct s3c_fb_vsync { ...@@ -189,7 +189,7 @@ struct s3c_fb_vsync {
/** /**
* struct s3c_fb - overall hardware state of the hardware * struct s3c_fb - overall hardware state of the hardware
* @slock: The spinlock protection for this data sturcture. * @slock: The spinlock protection for this data sturucture.
* @dev: The device that we bound to, for printing, etc. * @dev: The device that we bound to, for printing, etc.
* @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk.
* @lcd_clk: The clk (sclk) feeding pixclk. * @lcd_clk: The clk (sclk) feeding pixclk.
......
...@@ -662,7 +662,7 @@ static void savage_get_default_par(struct savagefb_par *par, struct savage_reg * ...@@ -662,7 +662,7 @@ static void savage_get_default_par(struct savagefb_par *par, struct savage_reg *
vga_out8(0x3c4, 0x18, par); vga_out8(0x3c4, 0x18, par);
reg->SR18 = vga_in8(0x3c5, par); reg->SR18 = vga_in8(0x3c5, par);
/* Save flat panel expansion regsters. */ /* Save flat panel expansion registers. */
if (par->chip == S3_SAVAGE_MX) { if (par->chip == S3_SAVAGE_MX) {
int i; int i;
...@@ -815,7 +815,7 @@ static void savage_set_default_par(struct savagefb_par *par, ...@@ -815,7 +815,7 @@ static void savage_set_default_par(struct savagefb_par *par,
vga_out8(0x3c4, 0x18, par); vga_out8(0x3c4, 0x18, par);
vga_out8(0x3c5, reg->SR18, par); vga_out8(0x3c5, reg->SR18, par);
/* Save flat panel expansion regsters. */ /* Save flat panel expansion registers. */
if (par->chip == S3_SAVAGE_MX) { if (par->chip == S3_SAVAGE_MX) {
int i; int i;
...@@ -1318,7 +1318,7 @@ static void savagefb_set_par_int(struct savagefb_par *par, struct savage_reg *r ...@@ -1318,7 +1318,7 @@ static void savagefb_set_par_int(struct savagefb_par *par, struct savage_reg *r
vga_out8(0x3c4, 0x15, par); vga_out8(0x3c4, 0x15, par);
vga_out8(0x3c5, reg->SR15, par); vga_out8(0x3c5, reg->SR15, par);
/* Restore flat panel expansion regsters. */ /* Restore flat panel expansion registers. */
if (par->chip == S3_SAVAGE_MX) { if (par->chip == S3_SAVAGE_MX) {
int i; int i;
......
...@@ -2628,7 +2628,8 @@ SiS_SetVCLKState(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -2628,7 +2628,8 @@ SiS_SetVCLKState(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
else if(VCLK >= 135) data = 0x02; else if(VCLK >= 135) data = 0x02;
if(SiS_Pr->ChipType == SIS_540) { if(SiS_Pr->ChipType == SIS_540) {
if((VCLK == 203) || (VCLK < 234)) data = 0x02; /* Was == 203 or < 234 which made no sense */
if (VCLK < 234) data = 0x02;
} }
if(SiS_Pr->ChipType < SIS_315H) { if(SiS_Pr->ChipType < SIS_315H) {
......
/* /*
* smscufx.c -- Framebuffer driver for SMSC UFX USB controller * smscufx.c -- Framebuffer driver for SMSC UFX USB controller
* *
* Copyright (C) 2011 Steve Glendinning <steve.glendinning@smsc.com> * Copyright (C) 2011 Steve Glendinning <steve.glendinning@shawell.net>
* Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it>
* Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com>
* Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>
...@@ -1002,7 +1002,7 @@ static int ufx_ops_ioctl(struct fb_info *info, unsigned int cmd, ...@@ -1002,7 +1002,7 @@ static int ufx_ops_ioctl(struct fb_info *info, unsigned int cmd,
/* TODO: Help propose a standard fb.h ioctl to report mmap damage */ /* TODO: Help propose a standard fb.h ioctl to report mmap damage */
if (cmd == UFX_IOCTL_REPORT_DAMAGE) { if (cmd == UFX_IOCTL_REPORT_DAMAGE) {
/* If we have a damage-aware client, turn fb_defio "off" /* If we have a damage-aware client, turn fb_defio "off"
* To avoid perf imact of unecessary page fault handling. * To avoid perf imact of unnecessary page fault handling.
* Done by resetting the delay for this fb_info to a very * Done by resetting the delay for this fb_info to a very
* long period. Pages will become writable and stay that way. * long period. Pages will become writable and stay that way.
* Reset to normal value when all clients have closed this fb. * Reset to normal value when all clients have closed this fb.
...@@ -1466,7 +1466,7 @@ static int ufx_read_edid(struct ufx_data *dev, u8 *edid, int edid_len) ...@@ -1466,7 +1466,7 @@ static int ufx_read_edid(struct ufx_data *dev, u8 *edid, int edid_len)
/* all FF's in the first 16 bytes indicates nothing is connected */ /* all FF's in the first 16 bytes indicates nothing is connected */
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
if (edid[i] != 0xFF) { if (edid[i] != 0xFF) {
pr_debug("edid data read succesfully"); pr_debug("edid data read successfully");
return EDID_LENGTH; return EDID_LENGTH;
} }
} }
...@@ -1972,6 +1972,6 @@ MODULE_PARM_DESC(console, "Allow fbcon to be used on this display"); ...@@ -1972,6 +1972,6 @@ MODULE_PARM_DESC(console, "Allow fbcon to be used on this display");
module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP);
MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support");
MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>");
MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <asm/io.h> #include <asm/io.h>
/* XXX This device has a 'dev-comm' property which aparently is /* XXX This device has a 'dev-comm' property which apparently is
* XXX a pointer into the openfirmware's address space which is * XXX a pointer into the openfirmware's address space which is
* XXX a shared area the kernel driver can use to keep OBP * XXX a shared area the kernel driver can use to keep OBP
* XXX informed about the current resolution setting. The idea * XXX informed about the current resolution setting. The idea
......
...@@ -929,7 +929,8 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, int bits, ...@@ -929,7 +929,8 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, int bits,
/** /**
* convert_extent - convert all bits in a given range from one bit to another * convert_extent_bit - convert all bits in a given range from one bit to
* another
* @tree: the io tree to search * @tree: the io tree to search
* @start: the start offset in bytes * @start: the start offset in bytes
* @end: the end offset in bytes (inclusive) * @end: the end offset in bytes (inclusive)
......
...@@ -86,7 +86,7 @@ int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb); ...@@ -86,7 +86,7 @@ int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb);
/** /**
* clk_get - lookup and obtain a reference to a clock producer. * clk_get - lookup and obtain a reference to a clock producer.
* @dev: device for clock "consumer" * @dev: device for clock "consumer"
* @id: clock comsumer ID * @id: clock consumer ID
* *
* Returns a struct clk corresponding to the clock producer, or * Returns a struct clk corresponding to the clock producer, or
* valid IS_ERR() condition containing errno. The implementation * valid IS_ERR() condition containing errno. The implementation
...@@ -103,7 +103,7 @@ struct clk *clk_get(struct device *dev, const char *id); ...@@ -103,7 +103,7 @@ struct clk *clk_get(struct device *dev, const char *id);
/** /**
* devm_clk_get - lookup and obtain a managed reference to a clock producer. * devm_clk_get - lookup and obtain a managed reference to a clock producer.
* @dev: device for clock "consumer" * @dev: device for clock "consumer"
* @id: clock comsumer ID * @id: clock consumer ID
* *
* Returns a struct clk corresponding to the clock producer, or * Returns a struct clk corresponding to the clock producer, or
* valid IS_ERR() condition containing errno. The implementation * valid IS_ERR() condition containing errno. The implementation
......
...@@ -188,7 +188,7 @@ static inline int is_unevictable_lru(enum lru_list lru) ...@@ -188,7 +188,7 @@ static inline int is_unevictable_lru(enum lru_list lru)
struct zone_reclaim_stat { struct zone_reclaim_stat {
/* /*
* The pageout code in vmscan.c keeps track of how many of the * The pageout code in vmscan.c keeps track of how many of the
* mem/swap backed and file backed pages are refeferenced. * mem/swap backed and file backed pages are referenced.
* The higher the rotated/scanned ratio, the more valuable * The higher the rotated/scanned ratio, the more valuable
* that cache is. * that cache is.
* *
......
...@@ -87,7 +87,7 @@ EXPORT_SYMBOL(div_s64_rem); ...@@ -87,7 +87,7 @@ EXPORT_SYMBOL(div_s64_rem);
* by the book 'Hacker's Delight'. The original source and full proof * by the book 'Hacker's Delight'. The original source and full proof
* can be found here and is available for use without restriction. * can be found here and is available for use without restriction.
* *
* 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c' * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
*/ */
#ifndef div64_u64 #ifndef div64_u64
u64 div64_u64(u64 dividend, u64 divisor) u64 div64_u64(u64 dividend, u64 divisor)
......
...@@ -1567,7 +1567,8 @@ static int vmscan_swappiness(struct scan_control *sc) ...@@ -1567,7 +1567,8 @@ static int vmscan_swappiness(struct scan_control *sc)
* by looking at the fraction of the pages scanned we did rotate back * by looking at the fraction of the pages scanned we did rotate back
* onto the active list instead of evict. * onto the active list instead of evict.
* *
* nr[0] = anon pages to scan; nr[1] = file pages to scan * nr[0] = anon inactive pages to scan; nr[1] = anon active pages to scan
* nr[2] = file inactive pages to scan; nr[3] = file active pages to scan
*/ */
static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
unsigned long *nr) unsigned long *nr)
...@@ -2537,7 +2538,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order, ...@@ -2537,7 +2538,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
* consider it to be no longer congested. It's * consider it to be no longer congested. It's
* possible there are dirty pages backed by * possible there are dirty pages backed by
* congested BDIs but as pressure is relieved, * congested BDIs but as pressure is relieved,
* spectulatively avoid congestion waits * speculatively avoid congestion waits
*/ */
zone_clear_flag(zone, ZONE_CONGESTED); zone_clear_flag(zone, ZONE_CONGESTED);
if (i <= *classzone_idx) if (i <= *classzone_idx)
......
...@@ -234,7 +234,7 @@ static int write_priomap(struct cgroup *cgrp, struct cftype *cft, ...@@ -234,7 +234,7 @@ static int write_priomap(struct cgroup *cgrp, struct cftype *cft,
/* /*
*Separate the devname from the associated priority *Separate the devname from the associated priority
*and advance the priostr poitner to the priority value *and advance the priostr pointer to the priority value
*/ */
*priostr = '\0'; *priostr = '\0';
priostr++; priostr++;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# The second row specify the type of the symbol: # The second row specify the type of the symbol:
# A = Absolute # A = Absolute
# B = Uninitialised data (.bss) # B = Uninitialised data (.bss)
# C = Comon symbol # C = Common symbol
# D = Initialised data # D = Initialised data
# G = Initialised data for small objects # G = Initialised data for small objects
# I = Indirect reference to another symbol # I = Indirect reference to another symbol
......
...@@ -438,7 +438,7 @@ static __inline__ void li_writeb(lithium_t *lith, int off, unsigned char val) ...@@ -438,7 +438,7 @@ static __inline__ void li_writeb(lithium_t *lith, int off, unsigned char val)
* *
* Observe that (mask & -mask) is (1 << low_set_bit_of(mask)). * Observe that (mask & -mask) is (1 << low_set_bit_of(mask)).
* As long as mask is constant, we trust the compiler will change the * As long as mask is constant, we trust the compiler will change the
* multipy and divide into shifts. * multiply and divide into shifts.
*/ */
#define SHIFT_FIELD(val, mask) (((val) * ((mask) & -(mask))) & (mask)) #define SHIFT_FIELD(val, mask) (((val) * ((mask) & -(mask))) & (mask))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册