diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
commit | 008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch) | |
tree | 81c88f744f6f3fc84132527c1ddc0b4da410c5e2 /drivers | |
parent | 8f685fbda43deccd130d192c9fcef1444649eaca (diff) | |
parent | bfc672dcf323877228682aff79dff8ecd9f30ff8 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
Documentation/trace/events.txt: Remove obsolete sched_signal_send.
writeback: fix global_dirty_limits comment runtime -> real-time
ppc: fix comment typo singal -> signal
drivers: fix comment typo diable -> disable.
m68k: fix comment typo diable -> disable.
wireless: comment typo fix diable -> disable.
media: comment typo fix diable -> disable.
remove doc for obsolete dynamic-printk kernel-parameter
remove extraneous 'is' from Documentation/iostats.txt
Fix spelling milisec -> ms in snd_ps3 module parameter description
Fix spelling mistakes in comments
Revert conflicting V4L changes
i7core_edac: fix typos in comments
mm/rmap.c: fix comment
sound, ca0106: Fix assignment to 'channel'.
hrtimer: fix a typo in comment
init/Kconfig: fix typo
anon_inodes: fix wrong function name in comment
fix comment typos concerning "consistent"
poll: fix a typo in comment
...
Fix up trivial conflicts in:
- drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
- fs/ext4/ext4.h
Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
Diffstat (limited to 'drivers')
155 files changed, 207 insertions, 207 deletions
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h index bdbfaf22bd14..962a3ccff6fd 100644 --- a/drivers/acpi/acpica/acobject.h +++ b/drivers/acpi/acpica/acobject.h | |||
@@ -93,7 +93,7 @@ | |||
93 | 93 | ||
94 | #define AOPOBJ_AML_CONSTANT 0x01 /* Integer is an AML constant */ | 94 | #define AOPOBJ_AML_CONSTANT 0x01 /* Integer is an AML constant */ |
95 | #define AOPOBJ_STATIC_POINTER 0x02 /* Data is part of an ACPI table, don't delete */ | 95 | #define AOPOBJ_STATIC_POINTER 0x02 /* Data is part of an ACPI table, don't delete */ |
96 | #define AOPOBJ_DATA_VALID 0x04 /* Object is intialized and data is valid */ | 96 | #define AOPOBJ_DATA_VALID 0x04 /* Object is initialized and data is valid */ |
97 | #define AOPOBJ_OBJECT_INITIALIZED 0x08 /* Region is initialized, _REG was run */ | 97 | #define AOPOBJ_OBJECT_INITIALIZED 0x08 /* Region is initialized, _REG was run */ |
98 | #define AOPOBJ_SETUP_COMPLETE 0x10 /* Region setup is complete */ | 98 | #define AOPOBJ_SETUP_COMPLETE 0x10 /* Region setup is complete */ |
99 | #define AOPOBJ_INVALID 0x20 /* Host OS won't allow a Region address */ | 99 | #define AOPOBJ_INVALID 0x20 /* Host OS won't allow a Region address */ |
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index cf29df69380b..096aebfe7f32 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #define EINJ_PFX "EINJ: " | 39 | #define EINJ_PFX "EINJ: " |
40 | 40 | ||
41 | #define SPIN_UNIT 100 /* 100ns */ | 41 | #define SPIN_UNIT 100 /* 100ns */ |
42 | /* Firmware should respond within 1 miliseconds */ | 42 | /* Firmware should respond within 1 milliseconds */ |
43 | #define FIRMWARE_TIMEOUT (1 * NSEC_PER_MSEC) | 43 | #define FIRMWARE_TIMEOUT (1 * NSEC_PER_MSEC) |
44 | 44 | ||
45 | /* | 45 | /* |
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index 5850d320404c..cf6db6b7662a 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c | |||
@@ -53,7 +53,7 @@ | |||
53 | sizeof(struct acpi_table_erst))) | 53 | sizeof(struct acpi_table_erst))) |
54 | 54 | ||
55 | #define SPIN_UNIT 100 /* 100ns */ | 55 | #define SPIN_UNIT 100 /* 100ns */ |
56 | /* Firmware should respond within 1 miliseconds */ | 56 | /* Firmware should respond within 1 milliseconds */ |
57 | #define FIRMWARE_TIMEOUT (1 * NSEC_PER_MSEC) | 57 | #define FIRMWARE_TIMEOUT (1 * NSEC_PER_MSEC) |
58 | #define FIRMWARE_MAX_STALL 50 /* 50us */ | 58 | #define FIRMWARE_MAX_STALL 50 /* 50us */ |
59 | 59 | ||
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index febb153b5a68..c423231b952b 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -319,7 +319,7 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state) | |||
319 | } | 319 | } |
320 | } | 320 | } |
321 | 321 | ||
322 | static struct platform_suspend_ops acpi_suspend_ops = { | 322 | static const struct platform_suspend_ops acpi_suspend_ops = { |
323 | .valid = acpi_suspend_state_valid, | 323 | .valid = acpi_suspend_state_valid, |
324 | .begin = acpi_suspend_begin, | 324 | .begin = acpi_suspend_begin, |
325 | .prepare_late = acpi_pm_prepare, | 325 | .prepare_late = acpi_pm_prepare, |
@@ -347,7 +347,7 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state) | |||
347 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has | 347 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has |
348 | * been requested. | 348 | * been requested. |
349 | */ | 349 | */ |
350 | static struct platform_suspend_ops acpi_suspend_ops_old = { | 350 | static const struct platform_suspend_ops acpi_suspend_ops_old = { |
351 | .valid = acpi_suspend_state_valid, | 351 | .valid = acpi_suspend_state_valid, |
352 | .begin = acpi_suspend_begin_old, | 352 | .begin = acpi_suspend_begin_old, |
353 | .prepare_late = acpi_pm_pre_suspend, | 353 | .prepare_late = acpi_pm_pre_suspend, |
@@ -506,7 +506,7 @@ static void acpi_pm_thaw(void) | |||
506 | acpi_enable_all_runtime_gpes(); | 506 | acpi_enable_all_runtime_gpes(); |
507 | } | 507 | } |
508 | 508 | ||
509 | static struct platform_hibernation_ops acpi_hibernation_ops = { | 509 | static const struct platform_hibernation_ops acpi_hibernation_ops = { |
510 | .begin = acpi_hibernation_begin, | 510 | .begin = acpi_hibernation_begin, |
511 | .end = acpi_pm_end, | 511 | .end = acpi_pm_end, |
512 | .pre_snapshot = acpi_pm_prepare, | 512 | .pre_snapshot = acpi_pm_prepare, |
@@ -549,7 +549,7 @@ static int acpi_hibernation_begin_old(void) | |||
549 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has | 549 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has |
550 | * been requested. | 550 | * been requested. |
551 | */ | 551 | */ |
552 | static struct platform_hibernation_ops acpi_hibernation_ops_old = { | 552 | static const struct platform_hibernation_ops acpi_hibernation_ops_old = { |
553 | .begin = acpi_hibernation_begin_old, | 553 | .begin = acpi_hibernation_begin_old, |
554 | .end = acpi_pm_end, | 554 | .end = acpi_pm_end, |
555 | .pre_snapshot = acpi_pm_pre_suspend, | 555 | .pre_snapshot = acpi_pm_pre_suspend, |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 5cd0228d2daa..15a0fde4b32a 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -260,7 +260,7 @@ static int acpi_video_set_brightness(struct backlight_device *bd) | |||
260 | vd->brightness->levels[request_level]); | 260 | vd->brightness->levels[request_level]); |
261 | } | 261 | } |
262 | 262 | ||
263 | static struct backlight_ops acpi_backlight_ops = { | 263 | static const struct backlight_ops acpi_backlight_ops = { |
264 | .get_brightness = acpi_video_get_brightness, | 264 | .get_brightness = acpi_video_get_brightness, |
265 | .update_status = acpi_video_set_brightness, | 265 | .update_status = acpi_video_set_brightness, |
266 | }; | 266 | }; |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 0a6a943b3779..a31fe96f7de6 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -2240,7 +2240,7 @@ int ata_dev_configure(struct ata_device *dev) | |||
2240 | if (id[ATA_ID_CFA_KEY_MGMT] & 1) | 2240 | if (id[ATA_ID_CFA_KEY_MGMT] & 1) |
2241 | ata_dev_printk(dev, KERN_WARNING, | 2241 | ata_dev_printk(dev, KERN_WARNING, |
2242 | "supports DRM functions and may " | 2242 | "supports DRM functions and may " |
2243 | "not be fully accessable.\n"); | 2243 | "not be fully accessible.\n"); |
2244 | snprintf(revbuf, 7, "CFA"); | 2244 | snprintf(revbuf, 7, "CFA"); |
2245 | } else { | 2245 | } else { |
2246 | snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id)); | 2246 | snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id)); |
@@ -2248,7 +2248,7 @@ int ata_dev_configure(struct ata_device *dev) | |||
2248 | if (ata_id_has_tpm(id)) | 2248 | if (ata_id_has_tpm(id)) |
2249 | ata_dev_printk(dev, KERN_WARNING, | 2249 | ata_dev_printk(dev, KERN_WARNING, |
2250 | "supports DRM functions and may " | 2250 | "supports DRM functions and may " |
2251 | "not be fully accessable.\n"); | 2251 | "not be fully accessible.\n"); |
2252 | } | 2252 | } |
2253 | 2253 | ||
2254 | dev->n_sectors = ata_id_n_sectors(id); | 2254 | dev->n_sectors = ata_id_n_sectors(id); |
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c index b777176ff494..e079cf29ed5d 100644 --- a/drivers/ata/sata_vsc.c +++ b/drivers/ata/sata_vsc.c | |||
@@ -370,7 +370,7 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev, | |||
370 | if (pci_resource_len(pdev, 0) == 0) | 370 | if (pci_resource_len(pdev, 0) == 0) |
371 | return -ENODEV; | 371 | return -ENODEV; |
372 | 372 | ||
373 | /* map IO regions and intialize host accordingly */ | 373 | /* map IO regions and initialize host accordingly */ |
374 | rc = pcim_iomap_regions(pdev, 1 << VSC_MMIO_BAR, DRV_NAME); | 374 | rc = pcim_iomap_regions(pdev, 1 << VSC_MMIO_BAR, DRV_NAME); |
375 | if (rc == -EBUSY) | 375 | if (rc == -EBUSY) |
376 | pcim_pin_device(pdev); | 376 | pcim_pin_device(pdev); |
diff --git a/drivers/atm/idt77252.h b/drivers/atm/idt77252.h index 5042bb2dab15..f53a43ae2bbe 100644 --- a/drivers/atm/idt77252.h +++ b/drivers/atm/idt77252.h | |||
@@ -572,7 +572,7 @@ struct idt77252_dev | |||
572 | #define SAR_STAT_TSQF 0x00001000 /* Transmit Status Queue full */ | 572 | #define SAR_STAT_TSQF 0x00001000 /* Transmit Status Queue full */ |
573 | #define SAR_STAT_TMROF 0x00000800 /* Timer overflow */ | 573 | #define SAR_STAT_TMROF 0x00000800 /* Timer overflow */ |
574 | #define SAR_STAT_PHYI 0x00000400 /* PHY device Interrupt flag */ | 574 | #define SAR_STAT_PHYI 0x00000400 /* PHY device Interrupt flag */ |
575 | #define SAR_STAT_CMDBZ 0x00000200 /* ABR SAR Comand Busy Flag */ | 575 | #define SAR_STAT_CMDBZ 0x00000200 /* ABR SAR Command Busy Flag */ |
576 | #define SAR_STAT_FBQ3A 0x00000100 /* Free Buffer Queue 3 Attention */ | 576 | #define SAR_STAT_FBQ3A 0x00000100 /* Free Buffer Queue 3 Attention */ |
577 | #define SAR_STAT_FBQ2A 0x00000080 /* Free Buffer Queue 2 Attention */ | 577 | #define SAR_STAT_FBQ2A 0x00000080 /* Free Buffer Queue 2 Attention */ |
578 | #define SAR_STAT_RSQF 0x00000040 /* Receive Status Queue full */ | 578 | #define SAR_STAT_RSQF 0x00000040 /* Receive Status Queue full */ |
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 729254053758..d80d51b62a1a 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
@@ -2063,7 +2063,7 @@ static int tx_init(struct atm_dev *dev) | |||
2063 | - UBR Table size is 4K | 2063 | - UBR Table size is 4K |
2064 | - UBR wait queue is 4K | 2064 | - UBR wait queue is 4K |
2065 | since the table and wait queues are contiguous, all the bytes | 2065 | since the table and wait queues are contiguous, all the bytes |
2066 | can be initialized by one memeset. | 2066 | can be initialized by one memeset. |
2067 | */ | 2067 | */ |
2068 | 2068 | ||
2069 | vcsize_sel = 0; | 2069 | vcsize_sel = 0; |
@@ -2089,7 +2089,7 @@ static int tx_init(struct atm_dev *dev) | |||
2089 | - ABR Table size is 2K | 2089 | - ABR Table size is 2K |
2090 | - ABR wait queue is 2K | 2090 | - ABR wait queue is 2K |
2091 | since the table and wait queues are contiguous, all the bytes | 2091 | since the table and wait queues are contiguous, all the bytes |
2092 | can be intialized by one memeset. | 2092 | can be initialized by one memeset. |
2093 | */ | 2093 | */ |
2094 | i = ABR_SCHED_TABLE * iadev->memSize; | 2094 | i = ABR_SCHED_TABLE * iadev->memSize; |
2095 | writew((i >> 11) & 0xffff, iadev->seg_reg+ABR_SBPTR_BASE); | 2095 | writew((i >> 11) & 0xffff, iadev->seg_reg+ABR_SBPTR_BASE); |
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index e243bd49764b..000e7b2006f8 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c | |||
@@ -975,7 +975,7 @@ struct klist *bus_get_device_klist(struct bus_type *bus) | |||
975 | EXPORT_SYMBOL_GPL(bus_get_device_klist); | 975 | EXPORT_SYMBOL_GPL(bus_get_device_klist); |
976 | 976 | ||
977 | /* | 977 | /* |
978 | * Yes, this forcably breaks the klist abstraction temporarily. It | 978 | * Yes, this forcibly breaks the klist abstraction temporarily. It |
979 | * just wants to sort the klist, not change reference counts and | 979 | * just wants to sort the klist, not change reference counts and |
980 | * take/drop locks rapidly in the process. It does all this while | 980 | * take/drop locks rapidly in the process. It does all this while |
981 | * holding the lock for the list, so objects can't otherwise be | 981 | * holding the lock for the list, so objects can't otherwise be |
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 2a52270aeb30..83404973f97a 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * | 8 | * |
9 | * | 9 | * |
10 | * The driver model core calls device_pm_add() when a device is registered. | 10 | * The driver model core calls device_pm_add() when a device is registered. |
11 | * This will intialize the embedded device_pm_info object in the device | 11 | * This will initialize the embedded device_pm_info object in the device |
12 | * and add it to the list of power-controlled devices. sysfs entries for | 12 | * and add it to the list of power-controlled devices. sysfs entries for |
13 | * controlling device power management will also be added. | 13 | * controlling device power management will also be added. |
14 | * | 14 | * |
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c index 3109bd94bc4f..78266382797e 100644 --- a/drivers/dma/intel_mid_dma.c +++ b/drivers/dma/intel_mid_dma.c | |||
@@ -1060,8 +1060,8 @@ static irqreturn_t intel_mid_dma_interrupt2(int irq, void *data) | |||
1060 | * mid_setup_dma - Setup the DMA controller | 1060 | * mid_setup_dma - Setup the DMA controller |
1061 | * @pdev: Controller PCI device structure | 1061 | * @pdev: Controller PCI device structure |
1062 | * | 1062 | * |
1063 | * Initilize the DMA controller, channels, registers with DMA engine, | 1063 | * Initialize the DMA controller, channels, registers with DMA engine, |
1064 | * ISR. Initilize DMA controller channels. | 1064 | * ISR. Initialize DMA controller channels. |
1065 | */ | 1065 | */ |
1066 | static int mid_setup_dma(struct pci_dev *pdev) | 1066 | static int mid_setup_dma(struct pci_dev *pdev) |
1067 | { | 1067 | { |
@@ -1217,7 +1217,7 @@ static void middma_shutdown(struct pci_dev *pdev) | |||
1217 | * @pdev: Controller PCI device structure | 1217 | * @pdev: Controller PCI device structure |
1218 | * @id: pci device id structure | 1218 | * @id: pci device id structure |
1219 | * | 1219 | * |
1220 | * Initilize the PCI device, map BARs, query driver data. | 1220 | * Initialize the PCI device, map BARs, query driver data. |
1221 | * Call setup_dma to complete contoller and chan initilzation | 1221 | * Call setup_dma to complete contoller and chan initilzation |
1222 | */ | 1222 | */ |
1223 | static int __devinit intel_mid_dma_probe(struct pci_dev *pdev, | 1223 | static int __devinit intel_mid_dma_probe(struct pci_dev *pdev, |
diff --git a/drivers/edac/amd8131_edac.h b/drivers/edac/amd8131_edac.h index 60e0d1c72dee..6f8b07131ec4 100644 --- a/drivers/edac/amd8131_edac.h +++ b/drivers/edac/amd8131_edac.h | |||
@@ -99,7 +99,7 @@ struct amd8131_dev_info { | |||
99 | 99 | ||
100 | /* | 100 | /* |
101 | * AMD8131 chipset has two pairs of PCIX Bridge and related IOAPIC | 101 | * AMD8131 chipset has two pairs of PCIX Bridge and related IOAPIC |
102 | * Controler, and ATCA-6101 has two AMD8131 chipsets, so there are | 102 | * Controller, and ATCA-6101 has two AMD8131 chipsets, so there are |
103 | * four PCIX Bridges on ATCA-6101 altogether. | 103 | * four PCIX Bridges on ATCA-6101 altogether. |
104 | * | 104 | * |
105 | * These PCIX Bridges share the same PCI Device ID and are all of | 105 | * These PCIX Bridges share the same PCI Device ID and are all of |
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c index c973004c002c..db1df59ae2b6 100644 --- a/drivers/edac/cell_edac.c +++ b/drivers/edac/cell_edac.c | |||
@@ -47,7 +47,7 @@ static void cell_edac_count_ce(struct mem_ctl_info *mci, int chan, u64 ar) | |||
47 | offset = address & ~PAGE_MASK; | 47 | offset = address & ~PAGE_MASK; |
48 | syndrome = (ar & 0x000000001fe00000ul) >> 21; | 48 | syndrome = (ar & 0x000000001fe00000ul) >> 21; |
49 | 49 | ||
50 | /* TODO: Decoding of the error addresss */ | 50 | /* TODO: Decoding of the error address */ |
51 | edac_mc_handle_ce(mci, csrow->first_page + pfn, offset, | 51 | edac_mc_handle_ce(mci, csrow->first_page + pfn, offset, |
52 | syndrome, 0, chan, ""); | 52 | syndrome, 0, chan, ""); |
53 | } | 53 | } |
@@ -68,7 +68,7 @@ static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar) | |||
68 | pfn = address >> PAGE_SHIFT; | 68 | pfn = address >> PAGE_SHIFT; |
69 | offset = address & ~PAGE_MASK; | 69 | offset = address & ~PAGE_MASK; |
70 | 70 | ||
71 | /* TODO: Decoding of the error addresss */ | 71 | /* TODO: Decoding of the error address */ |
72 | edac_mc_handle_ue(mci, csrow->first_page + pfn, offset, 0, ""); | 72 | edac_mc_handle_ue(mci, csrow->first_page + pfn, offset, 0, ""); |
73 | } | 73 | } |
74 | 74 | ||
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index ff1eb7bb26c6..3d965347a673 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h | |||
@@ -259,7 +259,7 @@ enum scrub_type { | |||
259 | * for single channel are 64 bits, for dual channel 128 | 259 | * for single channel are 64 bits, for dual channel 128 |
260 | * bits. | 260 | * bits. |
261 | * | 261 | * |
262 | * Single-Ranked stick: A Single-ranked stick has 1 chip-select row of memmory. | 262 | * Single-Ranked stick: A Single-ranked stick has 1 chip-select row of memory. |
263 | * Motherboards commonly drive two chip-select pins to | 263 | * Motherboards commonly drive two chip-select pins to |
264 | * a memory stick. A single-ranked stick, will occupy | 264 | * a memory stick. A single-ranked stick, will occupy |
265 | * only one of those rows. The other will be unused. | 265 | * only one of those rows. The other will be unused. |
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 362861c15779..81154ab296b6 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* Intel i7 core/Nehalem Memory Controller kernel module | 1 | /* Intel i7 core/Nehalem Memory Controller kernel module |
2 | * | 2 | * |
3 | * This driver supports yhe memory controllers found on the Intel | 3 | * This driver supports the memory controllers found on the Intel |
4 | * processor families i7core, i7core 7xx/8xx, i5core, Xeon 35xx, | 4 | * processor families i7core, i7core 7xx/8xx, i5core, Xeon 35xx, |
5 | * Xeon 55xx and Xeon 56xx also known as Nehalem, Nehalem-EP, Lynnfield | 5 | * Xeon 55xx and Xeon 56xx also known as Nehalem, Nehalem-EP, Lynnfield |
6 | * and Westmere-EP. | 6 | * and Westmere-EP. |
@@ -1271,7 +1271,7 @@ static void __init i7core_xeon_pci_fixup(const struct pci_id_table *table) | |||
1271 | int i; | 1271 | int i; |
1272 | 1272 | ||
1273 | /* | 1273 | /* |
1274 | * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core pci buses | 1274 | * On Xeon 55xx, the Intel Quick Path Arch Generic Non-core pci buses |
1275 | * aren't announced by acpi. So, we need to use a legacy scan probing | 1275 | * aren't announced by acpi. So, we need to use a legacy scan probing |
1276 | * to detect them | 1276 | * to detect them |
1277 | */ | 1277 | */ |
@@ -1864,7 +1864,7 @@ static int i7core_mce_check_error(void *priv, struct mce *mce) | |||
1864 | if (mce->mcgstatus & 1) | 1864 | if (mce->mcgstatus & 1) |
1865 | i7core_check_error(mci); | 1865 | i7core_check_error(mci); |
1866 | 1866 | ||
1867 | /* Advice mcelog that the error were handled */ | 1867 | /* Advise mcelog that the errors were handled */ |
1868 | return 1; | 1868 | return 1; |
1869 | } | 1869 | } |
1870 | 1870 | ||
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index 070cea41b661..b9f0c20df1aa 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c | |||
@@ -873,7 +873,7 @@ ppc4xx_edac_get_mtype(u32 mcopt1) | |||
873 | } | 873 | } |
874 | 874 | ||
875 | /** | 875 | /** |
876 | * ppc4xx_edac_init_csrows - intialize driver instance rows | 876 | * ppc4xx_edac_init_csrows - initialize driver instance rows |
877 | * @mci: A pointer to the EDAC memory controller instance | 877 | * @mci: A pointer to the EDAC memory controller instance |
878 | * associated with the ibm,sdram-4xx-ddr2 controller for which | 878 | * associated with the ibm,sdram-4xx-ddr2 controller for which |
879 | * the csrows (i.e. banks/ranks) are being initialized. | 879 | * the csrows (i.e. banks/ranks) are being initialized. |
@@ -881,7 +881,7 @@ ppc4xx_edac_get_mtype(u32 mcopt1) | |||
881 | * currently set for the controller, from which bank width | 881 | * currently set for the controller, from which bank width |
882 | * and memory typ information is derived. | 882 | * and memory typ information is derived. |
883 | * | 883 | * |
884 | * This routine intializes the virtual "chip select rows" associated | 884 | * This routine initializes the virtual "chip select rows" associated |
885 | * with the EDAC memory controller instance. An ibm,sdram-4xx-ddr2 | 885 | * with the EDAC memory controller instance. An ibm,sdram-4xx-ddr2 |
886 | * controller bank/rank is mapped to a row. | 886 | * controller bank/rank is mapped to a row. |
887 | * | 887 | * |
@@ -992,7 +992,7 @@ ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1) | |||
992 | } | 992 | } |
993 | 993 | ||
994 | /** | 994 | /** |
995 | * ppc4xx_edac_mc_init - intialize driver instance | 995 | * ppc4xx_edac_mc_init - initialize driver instance |
996 | * @mci: A pointer to the EDAC memory controller instance being | 996 | * @mci: A pointer to the EDAC memory controller instance being |
997 | * initialized. | 997 | * initialized. |
998 | * @op: A pointer to the OpenFirmware device tree node associated | 998 | * @op: A pointer to the OpenFirmware device tree node associated |
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c index b14c81110575..d3a9c6e02477 100644 --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c | |||
@@ -59,7 +59,7 @@ static int nv40_set_intensity(struct backlight_device *bd) | |||
59 | return 0; | 59 | return 0; |
60 | } | 60 | } |
61 | 61 | ||
62 | static struct backlight_ops nv40_bl_ops = { | 62 | static const struct backlight_ops nv40_bl_ops = { |
63 | .options = BL_CORE_SUSPENDRESUME, | 63 | .options = BL_CORE_SUSPENDRESUME, |
64 | .get_brightness = nv40_get_intensity, | 64 | .get_brightness = nv40_get_intensity, |
65 | .update_status = nv40_set_intensity, | 65 | .update_status = nv40_set_intensity, |
@@ -82,7 +82,7 @@ static int nv50_set_intensity(struct backlight_device *bd) | |||
82 | return 0; | 82 | return 0; |
83 | } | 83 | } |
84 | 84 | ||
85 | static struct backlight_ops nv50_bl_ops = { | 85 | static const struct backlight_ops nv50_bl_ops = { |
86 | .options = BL_CORE_SUSPENDRESUME, | 86 | .options = BL_CORE_SUSPENDRESUME, |
87 | .get_brightness = nv50_get_intensity, | 87 | .get_brightness = nv50_get_intensity, |
88 | .update_status = nv50_set_intensity, | 88 | .update_status = nv50_set_intensity, |
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index d3046559bf05..2aef5cd3acf5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
@@ -1927,7 +1927,7 @@ init_ltime(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) | |||
1927 | * offset (8 bit): opcode | 1927 | * offset (8 bit): opcode |
1928 | * offset + 1 (16 bit): time | 1928 | * offset + 1 (16 bit): time |
1929 | * | 1929 | * |
1930 | * Sleep for "time" miliseconds. | 1930 | * Sleep for "time" milliseconds. |
1931 | */ | 1931 | */ |
1932 | 1932 | ||
1933 | unsigned time = ROM16(bios->data[offset + 1]); | 1933 | unsigned time = ROM16(bios->data[offset + 1]); |
@@ -1935,7 +1935,7 @@ init_ltime(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) | |||
1935 | if (!iexec->execute) | 1935 | if (!iexec->execute) |
1936 | return 3; | 1936 | return 3; |
1937 | 1937 | ||
1938 | BIOSLOG(bios, "0x%04X: Sleeping for 0x%04X miliseconds\n", | 1938 | BIOSLOG(bios, "0x%04X: Sleeping for 0x%04X milliseconds\n", |
1939 | offset, time); | 1939 | offset, time); |
1940 | 1940 | ||
1941 | msleep(time); | 1941 | msleep(time); |
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h index 58a0cd02c0a2..04b269d14a59 100644 --- a/drivers/gpu/drm/radeon/atombios.h +++ b/drivers/gpu/drm/radeon/atombios.h | |||
@@ -1629,7 +1629,7 @@ typedef struct _GET_ENGINE_CLOCK_PARAMETERS | |||
1629 | typedef struct _READ_EDID_FROM_HW_I2C_DATA_PARAMETERS | 1629 | typedef struct _READ_EDID_FROM_HW_I2C_DATA_PARAMETERS |
1630 | { | 1630 | { |
1631 | USHORT usPrescale; //Ratio between Engine clock and I2C clock | 1631 | USHORT usPrescale; //Ratio between Engine clock and I2C clock |
1632 | USHORT usVRAMAddress; //Adress in Frame Buffer where to pace raw EDID | 1632 | USHORT usVRAMAddress; //Address in Frame Buffer where to pace raw EDID |
1633 | USHORT usStatus; //When use output: lower byte EDID checksum, high byte hardware status | 1633 | USHORT usStatus; //When use output: lower byte EDID checksum, high byte hardware status |
1634 | //WHen use input: lower byte as 'byte to read':currently limited to 128byte or 1byte | 1634 | //WHen use input: lower byte as 'byte to read':currently limited to 128byte or 1byte |
1635 | UCHAR ucSlaveAddr; //Read from which slave | 1635 | UCHAR ucSlaveAddr; //Read from which slave |
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index c9fffd0389fe..2bd3469b3071 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c | |||
@@ -434,7 +434,7 @@ static int read_i2c(struct nmk_i2c_dev *dev) | |||
434 | } | 434 | } |
435 | 435 | ||
436 | if (timeout == 0) { | 436 | if (timeout == 0) { |
437 | /* controler has timedout, re-init the h/w */ | 437 | /* controller has timedout, re-init the h/w */ |
438 | dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n"); | 438 | dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n"); |
439 | (void) init_hw(dev); | 439 | (void) init_hw(dev); |
440 | status = -ETIMEDOUT; | 440 | status = -ETIMEDOUT; |
@@ -498,7 +498,7 @@ static int write_i2c(struct nmk_i2c_dev *dev) | |||
498 | } | 498 | } |
499 | 499 | ||
500 | if (timeout == 0) { | 500 | if (timeout == 0) { |
501 | /* controler has timedout, re-init the h/w */ | 501 | /* controller has timedout, re-init the h/w */ |
502 | dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n"); | 502 | dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n"); |
503 | (void) init_hw(dev); | 503 | (void) init_hw(dev); |
504 | status = -ETIMEDOUT; | 504 | status = -ETIMEDOUT; |
diff --git a/drivers/infiniband/hw/cxgb3/cxio_wr.h b/drivers/infiniband/hw/cxgb3/cxio_wr.h index 4bb997aa39d0..83d2e19d31ae 100644 --- a/drivers/infiniband/hw/cxgb3/cxio_wr.h +++ b/drivers/infiniband/hw/cxgb3/cxio_wr.h | |||
@@ -689,7 +689,7 @@ struct t3_swrq { | |||
689 | * A T3 WQ implements both the SQ and RQ. | 689 | * A T3 WQ implements both the SQ and RQ. |
690 | */ | 690 | */ |
691 | struct t3_wq { | 691 | struct t3_wq { |
692 | union t3_wr *queue; /* DMA accessable memory */ | 692 | union t3_wr *queue; /* DMA accessible memory */ |
693 | dma_addr_t dma_addr; /* DMA address for HW */ | 693 | dma_addr_t dma_addr; /* DMA address for HW */ |
694 | DEFINE_DMA_UNMAP_ADDR(mapping); /* unmap kruft */ | 694 | DEFINE_DMA_UNMAP_ADDR(mapping); /* unmap kruft */ |
695 | u32 error; /* 1 once we go to ERROR */ | 695 | u32 error; /* 1 once we go to ERROR */ |
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index cc600c2dd0b3..2fe19ec9ba60 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <linux/timer.h> | 46 | #include <linux/timer.h> |
47 | #include <linux/io.h> | 47 | #include <linux/io.h> |
48 | #include <linux/kfifo.h> | 48 | #include <linux/kfifo.h> |
49 | #include <linux/mutex.h> | ||
50 | 49 | ||
51 | #include <asm/byteorder.h> | 50 | #include <asm/byteorder.h> |
52 | 51 | ||
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c index dbbb0e85afe4..abd409d592ef 100644 --- a/drivers/infiniband/hw/qib/qib_iba7322.c +++ b/drivers/infiniband/hw/qib/qib_iba7322.c | |||
@@ -332,7 +332,7 @@ MODULE_PARM_DESC(txselect, \ | |||
332 | #define krp_serdesctrl KREG_IBPORT_IDX(IBSerdesCtrl) | 332 | #define krp_serdesctrl KREG_IBPORT_IDX(IBSerdesCtrl) |
333 | 333 | ||
334 | /* | 334 | /* |
335 | * Per-context kernel registers. Acess only with qib_read_kreg_ctxt() | 335 | * Per-context kernel registers. Access only with qib_read_kreg_ctxt() |
336 | * or qib_write_kreg_ctxt() | 336 | * or qib_write_kreg_ctxt() |
337 | */ | 337 | */ |
338 | #define krc_rcvhdraddr KREG_IDX(RcvHdrAddr0) | 338 | #define krc_rcvhdraddr KREG_IDX(RcvHdrAddr0) |
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index bcb1fdedb595..307eef77a172 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig | |||
@@ -229,7 +229,7 @@ config SERIO_PS2MULT | |||
229 | tristate "TQC PS/2 multiplexer" | 229 | tristate "TQC PS/2 multiplexer" |
230 | help | 230 | help |
231 | Say Y here if you have the PS/2 line multiplexer like the one | 231 | Say Y here if you have the PS/2 line multiplexer like the one |
232 | present on TQC boads. | 232 | present on TQC boards. |
233 | 233 | ||
234 | To compile this driver as a module, choose M here: the | 234 | To compile this driver as a module, choose M here: the |
235 | module will be called ps2mult. | 235 | module will be called ps2mult. |
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 07ac77d393a4..0c9f4b158ff0 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
@@ -610,7 +610,7 @@ config TOUCHSCREEN_USB_ZYTRONIC | |||
610 | 610 | ||
611 | config TOUCHSCREEN_USB_ETT_TC45USB | 611 | config TOUCHSCREEN_USB_ETT_TC45USB |
612 | default y | 612 | default y |
613 | bool "ET&T USB series TC4UM/TC5UH touchscreen controler support" if EMBEDDED | 613 | bool "ET&T USB series TC4UM/TC5UH touchscreen controller support" if EMBEDDED |
614 | depends on TOUCHSCREEN_USB_COMPOSITE | 614 | depends on TOUCHSCREEN_USB_COMPOSITE |
615 | 615 | ||
616 | config TOUCHSCREEN_USB_NEXIO | 616 | config TOUCHSCREEN_USB_NEXIO |
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c index 178942a2ee61..8a3c5cfc4fea 100644 --- a/drivers/isdn/gigaset/bas-gigaset.c +++ b/drivers/isdn/gigaset/bas-gigaset.c | |||
@@ -2318,7 +2318,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
2318 | __func__, le16_to_cpu(udev->descriptor.idVendor), | 2318 | __func__, le16_to_cpu(udev->descriptor.idVendor), |
2319 | le16_to_cpu(udev->descriptor.idProduct)); | 2319 | le16_to_cpu(udev->descriptor.idProduct)); |
2320 | 2320 | ||
2321 | /* allocate memory for our device state and intialize it */ | 2321 | /* allocate memory for our device state and initialize it */ |
2322 | cs = gigaset_initcs(driver, BAS_CHANNELS, 0, 0, cidmode, | 2322 | cs = gigaset_initcs(driver, BAS_CHANNELS, 0, 0, cidmode, |
2323 | GIGASET_MODULENAME); | 2323 | GIGASET_MODULENAME); |
2324 | if (!cs) | 2324 | if (!cs) |
@@ -2576,7 +2576,7 @@ static int __init bas_gigaset_init(void) | |||
2576 | { | 2576 | { |
2577 | int result; | 2577 | int result; |
2578 | 2578 | ||
2579 | /* allocate memory for our driver state and intialize it */ | 2579 | /* allocate memory for our driver state and initialize it */ |
2580 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, | 2580 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, |
2581 | GIGASET_MODULENAME, GIGASET_DEVNAME, | 2581 | GIGASET_MODULENAME, GIGASET_DEVNAME, |
2582 | &gigops, THIS_MODULE); | 2582 | &gigops, THIS_MODULE); |
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index d151dcbf770d..0ef09d0eb96b 100644 --- a/drivers/isdn/gigaset/ser-gigaset.c +++ b/drivers/isdn/gigaset/ser-gigaset.c | |||
@@ -513,7 +513,7 @@ gigaset_tty_open(struct tty_struct *tty) | |||
513 | return -ENODEV; | 513 | return -ENODEV; |
514 | } | 514 | } |
515 | 515 | ||
516 | /* allocate memory for our device state and intialize it */ | 516 | /* allocate memory for our device state and initialize it */ |
517 | cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME); | 517 | cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME); |
518 | if (!cs) | 518 | if (!cs) |
519 | goto error; | 519 | goto error; |
@@ -771,7 +771,7 @@ static int __init ser_gigaset_init(void) | |||
771 | return rc; | 771 | return rc; |
772 | } | 772 | } |
773 | 773 | ||
774 | /* allocate memory for our driver state and intialize it */ | 774 | /* allocate memory for our driver state and initialize it */ |
775 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, | 775 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, |
776 | GIGASET_MODULENAME, GIGASET_DEVNAME, | 776 | GIGASET_MODULENAME, GIGASET_DEVNAME, |
777 | &ops, THIS_MODULE); | 777 | &ops, THIS_MODULE); |
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c index 4a66338f4e7d..5e3300d8a2a5 100644 --- a/drivers/isdn/gigaset/usb-gigaset.c +++ b/drivers/isdn/gigaset/usb-gigaset.c | |||
@@ -695,7 +695,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
695 | 695 | ||
696 | dev_info(&udev->dev, "%s: Device matched ... !\n", __func__); | 696 | dev_info(&udev->dev, "%s: Device matched ... !\n", __func__); |
697 | 697 | ||
698 | /* allocate memory for our device state and intialize it */ | 698 | /* allocate memory for our device state and initialize it */ |
699 | cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME); | 699 | cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME); |
700 | if (!cs) | 700 | if (!cs) |
701 | return -ENODEV; | 701 | return -ENODEV; |
@@ -894,7 +894,7 @@ static int __init usb_gigaset_init(void) | |||
894 | { | 894 | { |
895 | int result; | 895 | int result; |
896 | 896 | ||
897 | /* allocate memory for our driver state and intialize it */ | 897 | /* allocate memory for our driver state and initialize it */ |
898 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, | 898 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, |
899 | GIGASET_MODULENAME, GIGASET_DEVNAME, | 899 | GIGASET_MODULENAME, GIGASET_DEVNAME, |
900 | &ops, THIS_MODULE); | 900 | &ops, THIS_MODULE); |
diff --git a/drivers/isdn/hardware/mISDN/ipac.h b/drivers/isdn/hardware/mISDN/ipac.h index 74a6ccf9065c..8121e046b739 100644 --- a/drivers/isdn/hardware/mISDN/ipac.h +++ b/drivers/isdn/hardware/mISDN/ipac.h | |||
@@ -29,7 +29,7 @@ struct isac_hw { | |||
29 | u32 type; | 29 | u32 type; |
30 | u32 off; /* offset to isac regs */ | 30 | u32 off; /* offset to isac regs */ |
31 | char *name; | 31 | char *name; |
32 | spinlock_t *hwlock; /* lock HW acccess */ | 32 | spinlock_t *hwlock; /* lock HW access */ |
33 | read_reg_func *read_reg; | 33 | read_reg_func *read_reg; |
34 | write_reg_func *write_reg; | 34 | write_reg_func *write_reg; |
35 | fifo_func *read_fifo; | 35 | fifo_func *read_fifo; |
@@ -70,7 +70,7 @@ struct ipac_hw { | |||
70 | struct hscx_hw hscx[2]; | 70 | struct hscx_hw hscx[2]; |
71 | char *name; | 71 | char *name; |
72 | void *hw; | 72 | void *hw; |
73 | spinlock_t *hwlock; /* lock HW acccess */ | 73 | spinlock_t *hwlock; /* lock HW access */ |
74 | struct module *owner; | 74 | struct module *owner; |
75 | u32 type; | 75 | u32 type; |
76 | read_reg_func *read_reg; | 76 | read_reg_func *read_reg; |
diff --git a/drivers/isdn/hardware/mISDN/isar.h b/drivers/isdn/hardware/mISDN/isar.h index 4a134acd44d0..9962bdf699c7 100644 --- a/drivers/isdn/hardware/mISDN/isar.h +++ b/drivers/isdn/hardware/mISDN/isar.h | |||
@@ -44,7 +44,7 @@ struct isar_ch { | |||
44 | struct isar_hw { | 44 | struct isar_hw { |
45 | struct isar_ch ch[2]; | 45 | struct isar_ch ch[2]; |
46 | void *hw; | 46 | void *hw; |
47 | spinlock_t *hwlock; /* lock HW acccess */ | 47 | spinlock_t *hwlock; /* lock HW access */ |
48 | char *name; | 48 | char *name; |
49 | struct module *owner; | 49 | struct module *owner; |
50 | read_reg_func *read_reg; | 50 | read_reg_func *read_reg; |
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index 76d9e673b4e1..309bacf1fadc 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c | |||
@@ -112,7 +112,7 @@ | |||
112 | * Disable rx-data: | 112 | * Disable rx-data: |
113 | * If cmx is realized in hardware, rx data will be disabled if requested by | 113 | * If cmx is realized in hardware, rx data will be disabled if requested by |
114 | * the upper layer. If dtmf decoding is done by software and enabled, rx data | 114 | * the upper layer. If dtmf decoding is done by software and enabled, rx data |
115 | * will not be diabled but blocked to the upper layer. | 115 | * will not be disabled but blocked to the upper layer. |
116 | * | 116 | * |
117 | * HFC conference engine: | 117 | * HFC conference engine: |
118 | * If it is possible to realize all features using hardware, hardware will be | 118 | * If it is possible to realize all features using hardware, hardware will be |
diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c index 1cec02f6c431..ade1e656bfb2 100644 --- a/drivers/macintosh/via-pmu-backlight.c +++ b/drivers/macintosh/via-pmu-backlight.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #define MAX_PMU_LEVEL 0xFF | 16 | #define MAX_PMU_LEVEL 0xFF |
17 | 17 | ||
18 | static struct backlight_ops pmu_backlight_data; | 18 | static const struct backlight_ops pmu_backlight_data; |
19 | static DEFINE_SPINLOCK(pmu_backlight_lock); | 19 | static DEFINE_SPINLOCK(pmu_backlight_lock); |
20 | static int sleeping, uses_pmu_bl; | 20 | static int sleeping, uses_pmu_bl; |
21 | static u8 bl_curve[FB_BACKLIGHT_LEVELS]; | 21 | static u8 bl_curve[FB_BACKLIGHT_LEVELS]; |
@@ -115,7 +115,7 @@ static int pmu_backlight_get_brightness(struct backlight_device *bd) | |||
115 | return bd->props.brightness; | 115 | return bd->props.brightness; |
116 | } | 116 | } |
117 | 117 | ||
118 | static struct backlight_ops pmu_backlight_data = { | 118 | static const struct backlight_ops pmu_backlight_data = { |
119 | .get_brightness = pmu_backlight_get_brightness, | 119 | .get_brightness = pmu_backlight_get_brightness, |
120 | .update_status = pmu_backlight_update_status, | 120 | .update_status = pmu_backlight_update_status, |
121 | 121 | ||
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index cd29c8248386..8b021eb0d48c 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
@@ -2257,7 +2257,7 @@ static int pmu_sleep_valid(suspend_state_t state) | |||
2257 | && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); | 2257 | && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); |
2258 | } | 2258 | } |
2259 | 2259 | ||
2260 | static struct platform_suspend_ops pmu_pm_ops = { | 2260 | static const struct platform_suspend_ops pmu_pm_ops = { |
2261 | .enter = powerbook_sleep, | 2261 | .enter = powerbook_sleep, |
2262 | .valid = pmu_sleep_valid, | 2262 | .valid = pmu_sleep_valid, |
2263 | }; | 2263 | }; |
diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h index 2c00980acfcb..7e40035028d2 100644 --- a/drivers/media/video/cx18/cx23418.h +++ b/drivers/media/video/cx18/cx23418.h | |||
@@ -177,7 +177,7 @@ | |||
177 | IN[0] - Task handle. | 177 | IN[0] - Task handle. |
178 | IN[1] - luma type: 0 = disable, 1 = 1D horizontal only, 2 = 1D vertical only, | 178 | IN[1] - luma type: 0 = disable, 1 = 1D horizontal only, 2 = 1D vertical only, |
179 | 3 = 2D H/V separable, 4 = 2D symmetric non-separable | 179 | 3 = 2D H/V separable, 4 = 2D symmetric non-separable |
180 | IN[2] - chroma type: 0 - diable, 1 = 1D horizontal | 180 | IN[2] - chroma type: 0 - disable, 1 = 1D horizontal |
181 | ReturnCode - One of the ERR_CAPTURE_... */ | 181 | ReturnCode - One of the ERR_CAPTURE_... */ |
182 | #define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C) | 182 | #define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C) |
183 | 183 | ||
diff --git a/drivers/media/video/cx25840/cx25840-ir.c b/drivers/media/video/cx25840/cx25840-ir.c index 627926f6bde8..7eb79af28aa3 100644 --- a/drivers/media/video/cx25840/cx25840-ir.c +++ b/drivers/media/video/cx25840/cx25840-ir.c | |||
@@ -261,7 +261,7 @@ static u16 ns_to_pulse_width_count(u32 ns, u16 divider) | |||
261 | u32 rem; | 261 | u32 rem; |
262 | 262 | ||
263 | /* | 263 | /* |
264 | * The 2 lsb's of the pulse width timer count are not accessable, hence | 264 | * The 2 lsb's of the pulse width timer count are not accessible, hence |
265 | * the (1 << 2) | 265 | * the (1 << 2) |
266 | */ | 266 | */ |
267 | n = ((u64) ns) * CX25840_IR_REFCLK_FREQ / 1000000; /* millicycles */ | 267 | n = ((u64) ns) * CX25840_IR_REFCLK_FREQ / 1000000; /* millicycles */ |
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h index 188841b476e0..ebd5c4338ebb 100644 --- a/drivers/media/video/davinci/vpif.h +++ b/drivers/media/video/davinci/vpif.h | |||
@@ -33,7 +33,7 @@ extern spinlock_t vpif_lock; | |||
33 | #define regr(reg) readl((reg) + vpif_base) | 33 | #define regr(reg) readl((reg) + vpif_base) |
34 | #define regw(value, reg) writel(value, (reg + vpif_base)) | 34 | #define regw(value, reg) writel(value, (reg + vpif_base)) |
35 | 35 | ||
36 | /* Register Addresss Offsets */ | 36 | /* Register Address Offsets */ |
37 | #define VPIF_PID (0x0000) | 37 | #define VPIF_PID (0x0000) |
38 | #define VPIF_CH0_CTRL (0x0004) | 38 | #define VPIF_CH0_CTRL (0x0004) |
39 | #define VPIF_CH1_CTRL (0x0008) | 39 | #define VPIF_CH1_CTRL (0x0008) |
diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/video/davinci/vpss.c index 7918680917d0..3e5cf27ec2b2 100644 --- a/drivers/media/video/davinci/vpss.c +++ b/drivers/media/video/davinci/vpss.c | |||
@@ -85,7 +85,7 @@ enum vpss_platform_type { | |||
85 | /* | 85 | /* |
86 | * vpss operations. Depends on platform. Not all functions are available | 86 | * vpss operations. Depends on platform. Not all functions are available |
87 | * on all platforms. The api, first check if a functio is available before | 87 | * on all platforms. The api, first check if a functio is available before |
88 | * invoking it. In the probe, the function ptrs are intialized based on | 88 | * invoking it. In the probe, the function ptrs are initialized based on |
89 | * vpss name. vpss name can be "dm355_vpss", "dm644x_vpss" etc. | 89 | * vpss name. vpss name can be "dm355_vpss", "dm644x_vpss" etc. |
90 | */ | 90 | */ |
91 | struct vpss_hw_ops { | 91 | struct vpss_hw_ops { |
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 83de97ad971e..029a4babfd61 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c | |||
@@ -1286,7 +1286,7 @@ static int omap_vout_release(struct file *file) | |||
1286 | videobuf_mmap_free(q); | 1286 | videobuf_mmap_free(q); |
1287 | 1287 | ||
1288 | /* Even if apply changes fails we should continue | 1288 | /* Even if apply changes fails we should continue |
1289 | freeing allocated memeory */ | 1289 | freeing allocated memory */ |
1290 | if (vout->streaming) { | 1290 | if (vout->streaming) { |
1291 | u32 mask = 0; | 1291 | u32 mask = 0; |
1292 | 1292 | ||
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c index d6bf3f82cc34..58af67f2278b 100644 --- a/drivers/media/video/saa7164/saa7164-core.c +++ b/drivers/media/video/saa7164/saa7164-core.c | |||
@@ -655,8 +655,8 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id) | |||
655 | goto out; | 655 | goto out; |
656 | } | 656 | } |
657 | 657 | ||
658 | /* Check that the hardware is accessable. If the status bytes are | 658 | /* Check that the hardware is accessible. If the status bytes are |
659 | * 0xFF then the device is not accessable, the the IRQ belongs | 659 | * 0xFF then the device is not accessible, the the IRQ belongs |
660 | * to another driver. | 660 | * to another driver. |
661 | * 4 x u32 interrupt registers. | 661 | * 4 x u32 interrupt registers. |
662 | */ | 662 | */ |
diff --git a/drivers/media/video/sn9c102/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h index 494957b10bac..7f38549715b6 100644 --- a/drivers/media/video/sn9c102/sn9c102_sensor.h +++ b/drivers/media/video/sn9c102/sn9c102_sensor.h | |||
@@ -147,7 +147,7 @@ enum sn9c102_i2c_interface { | |||
147 | 147 | ||
148 | struct sn9c102_sensor { | 148 | struct sn9c102_sensor { |
149 | char name[32], /* sensor name */ | 149 | char name[32], /* sensor name */ |
150 | maintainer[64]; /* name of the mantainer <email> */ | 150 | maintainer[64]; /* name of the maintainer <email> */ |
151 | 151 | ||
152 | enum sn9c102_bridge supported_bridge; /* supported SN9C1xx bridges */ | 152 | enum sn9c102_bridge supported_bridge; /* supported SN9C1xx bridges */ |
153 | 153 | ||
diff --git a/drivers/media/video/tvp7002.c b/drivers/media/video/tvp7002.c index e63b40f5a706..c799e4eb6fcd 100644 --- a/drivers/media/video/tvp7002.c +++ b/drivers/media/video/tvp7002.c | |||
@@ -789,7 +789,7 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd, | |||
789 | * Get the value of a TVP7002 decoder device register. | 789 | * Get the value of a TVP7002 decoder device register. |
790 | * Returns zero when successful, -EINVAL if register read fails or | 790 | * Returns zero when successful, -EINVAL if register read fails or |
791 | * access to I2C client fails, -EPERM if the call is not allowed | 791 | * access to I2C client fails, -EPERM if the call is not allowed |
792 | * by diabled CAP_SYS_ADMIN. | 792 | * by disabled CAP_SYS_ADMIN. |
793 | */ | 793 | */ |
794 | static int tvp7002_g_register(struct v4l2_subdev *sd, | 794 | static int tvp7002_g_register(struct v4l2_subdev *sd, |
795 | struct v4l2_dbg_register *reg) | 795 | struct v4l2_dbg_register *reg) |
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c index e25aca5759fb..2f973cd56408 100644 --- a/drivers/media/video/via-camera.c +++ b/drivers/media/video/via-camera.c | |||
@@ -13,14 +13,12 @@ | |||
13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
14 | #include <linux/gpio.h> | 14 | #include <linux/gpio.h> |
15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
16 | #include <linux/pci.h> | ||
17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
18 | #include <linux/videodev2.h> | 17 | #include <linux/videodev2.h> |
19 | #include <media/v4l2-device.h> | 18 | #include <media/v4l2-device.h> |
20 | #include <media/v4l2-ioctl.h> | 19 | #include <media/v4l2-ioctl.h> |
21 | #include <media/v4l2-chip-ident.h> | 20 | #include <media/v4l2-chip-ident.h> |
22 | #include <media/videobuf-dma-sg.h> | 21 | #include <media/videobuf-dma-sg.h> |
23 | #include <linux/device.h> | ||
24 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
25 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
26 | #include <linux/pm_qos_params.h> | 24 | #include <linux/pm_qos_params.h> |
diff --git a/drivers/message/fusion/lsi/mpi_log_sas.h b/drivers/message/fusion/lsi/mpi_log_sas.h index 691620dbedd2..8b04810df469 100644 --- a/drivers/message/fusion/lsi/mpi_log_sas.h +++ b/drivers/message/fusion/lsi/mpi_log_sas.h | |||
@@ -268,7 +268,7 @@ | |||
268 | 268 | ||
269 | /* Compatibility Error : IR Disabled */ | 269 | /* Compatibility Error : IR Disabled */ |
270 | #define IR_LOGINFO_COMPAT_ERROR_RAID_DISABLED (0x00010030) | 270 | #define IR_LOGINFO_COMPAT_ERROR_RAID_DISABLED (0x00010030) |
271 | /* Compatibility Error : Inquiry Comand failed */ | 271 | /* Compatibility Error : Inquiry Command failed */ |
272 | #define IR_LOGINFO_COMPAT_ERROR_INQUIRY_FAILED (0x00010031) | 272 | #define IR_LOGINFO_COMPAT_ERROR_INQUIRY_FAILED (0x00010031) |
273 | /* Compatibility Error : Device not direct access device */ | 273 | /* Compatibility Error : Device not direct access device */ |
274 | #define IR_LOGINFO_COMPAT_ERROR_NOT_DIRECT_ACCESS (0x00010032) | 274 | #define IR_LOGINFO_COMPAT_ERROR_NOT_DIRECT_ACCESS (0x00010032) |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 3e57b61ca446..3358c0af3466 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -7977,7 +7977,7 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info) | |||
7977 | NULL, /* 2Eh */ | 7977 | NULL, /* 2Eh */ |
7978 | NULL, /* 2Fh */ | 7978 | NULL, /* 2Fh */ |
7979 | "Compatibility Error: IR Disabled", /* 30h */ | 7979 | "Compatibility Error: IR Disabled", /* 30h */ |
7980 | "Compatibility Error: Inquiry Comand Failed", /* 31h */ | 7980 | "Compatibility Error: Inquiry Command Failed", /* 31h */ |
7981 | "Compatibility Error: Device not Direct Access " | 7981 | "Compatibility Error: Device not Direct Access " |
7982 | "Device ", /* 32h */ | 7982 | "Device ", /* 32h */ |
7983 | "Compatibility Error: Removable Device Found", /* 33h */ | 7983 | "Compatibility Error: Removable Device Found", /* 33h */ |
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index d48c2c6058e1..8aefb1829fcd 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c | |||
@@ -1146,7 +1146,7 @@ mptsas_target_reset_queue(MPT_ADAPTER *ioc, | |||
1146 | * | 1146 | * |
1147 | * This function will delete scheduled target reset from the list and | 1147 | * This function will delete scheduled target reset from the list and |
1148 | * try to send next target reset. This will be called from completion | 1148 | * try to send next target reset. This will be called from completion |
1149 | * context of any Task managment command. | 1149 | * context of any Task management command. |
1150 | */ | 1150 | */ |
1151 | 1151 | ||
1152 | void | 1152 | void |
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index f87a9d405a5e..ae7cad185898 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
@@ -309,7 +309,7 @@ static inline void i2o_block_request_free(struct i2o_block_request *ireq) | |||
309 | * @ireq: I2O block request | 309 | * @ireq: I2O block request |
310 | * @mptr: message body pointer | 310 | * @mptr: message body pointer |
311 | * | 311 | * |
312 | * Builds the SG list and map it to be accessable by the controller. | 312 | * Builds the SG list and map it to be accessible by the controller. |
313 | * | 313 | * |
314 | * Returns 0 on failure or 1 on success. | 314 | * Returns 0 on failure or 1 on success. |
315 | */ | 315 | */ |
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 4d073f1e4502..1e1a4be8eb6c 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -402,7 +402,7 @@ config TI_DAC7512 | |||
402 | DAC7512 16-bit digital-to-analog converter. | 402 | DAC7512 16-bit digital-to-analog converter. |
403 | 403 | ||
404 | This driver can also be built as a module. If so, the module | 404 | This driver can also be built as a module. If so, the module |
405 | will be calles ti_dac7512. | 405 | will be called ti_dac7512. |
406 | 406 | ||
407 | config VMWARE_BALLOON | 407 | config VMWARE_BALLOON |
408 | tristate "VMware Balloon Driver" | 408 | tristate "VMware Balloon Driver" |
diff --git a/drivers/misc/arm-charlcd.c b/drivers/misc/arm-charlcd.c index 9e3879ef58f2..fe8616a8d287 100644 --- a/drivers/misc/arm-charlcd.c +++ b/drivers/misc/arm-charlcd.c | |||
@@ -313,7 +313,7 @@ static int __init charlcd_probe(struct platform_device *pdev) | |||
313 | INIT_DELAYED_WORK(&lcd->init_work, charlcd_init_work); | 313 | INIT_DELAYED_WORK(&lcd->init_work, charlcd_init_work); |
314 | schedule_delayed_work(&lcd->init_work, 0); | 314 | schedule_delayed_work(&lcd->init_work, 0); |
315 | 315 | ||
316 | dev_info(&pdev->dev, "initalized ARM character LCD at %08x\n", | 316 | dev_info(&pdev->dev, "initialized ARM character LCD at %08x\n", |
317 | lcd->phybase); | 317 | lcd->phybase); |
318 | 318 | ||
319 | return 0; | 319 | return 0; |
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 217f82037fc1..bfc8a8ae55df 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
@@ -257,7 +257,7 @@ static u32 get_card_status(struct mmc_card *card, struct request *req) | |||
257 | cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC; | 257 | cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC; |
258 | err = mmc_wait_for_cmd(card->host, &cmd, 0); | 258 | err = mmc_wait_for_cmd(card->host, &cmd, 0); |
259 | if (err) | 259 | if (err) |
260 | printk(KERN_ERR "%s: error %d sending status comand", | 260 | printk(KERN_ERR "%s: error %d sending status command", |
261 | req->rq_disk->disk_name, err); | 261 | req->rq_disk->disk_name, err); |
262 | return cmd.resp[0]; | 262 | return cmd.resp[0]; |
263 | } | 263 | } |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index c22a4c039988..afe8c6fa166a 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -501,7 +501,7 @@ config MMC_SH_MMCIF | |||
501 | tristate "SuperH Internal MMCIF support" | 501 | tristate "SuperH Internal MMCIF support" |
502 | depends on MMC_BLOCK && (SUPERH || ARCH_SHMOBILE) | 502 | depends on MMC_BLOCK && (SUPERH || ARCH_SHMOBILE) |
503 | help | 503 | help |
504 | This selects the MMC Host Interface controler (MMCIF). | 504 | This selects the MMC Host Interface controller (MMCIF). |
505 | 505 | ||
506 | This driver supports MMCIF in sh7724/sh7757/sh7372. | 506 | This driver supports MMCIF in sh7724/sh7757/sh7372. |
507 | 507 | ||
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index 41e5a60493ad..ef72e874ca36 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c | |||
@@ -192,7 +192,7 @@ static inline void SEND_STOP(struct au1xmmc_host *host) | |||
192 | au_writel(config2 | SD_CONFIG2_DF, HOST_CONFIG2(host)); | 192 | au_writel(config2 | SD_CONFIG2_DF, HOST_CONFIG2(host)); |
193 | au_sync(); | 193 | au_sync(); |
194 | 194 | ||
195 | /* Send the stop commmand */ | 195 | /* Send the stop command */ |
196 | au_writel(STOP_CMD, HOST_CMD(host)); | 196 | au_writel(STOP_CMD, HOST_CMD(host)); |
197 | } | 197 | } |
198 | 198 | ||
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c index f472c2714eb8..bbc298fd2a15 100644 --- a/drivers/mmc/host/sdricoh_cs.c +++ b/drivers/mmc/host/sdricoh_cs.c | |||
@@ -446,7 +446,7 @@ static int sdricoh_init_mmc(struct pci_dev *pci_dev, | |||
446 | mmc->max_seg_size = 1024 * 512; | 446 | mmc->max_seg_size = 1024 * 512; |
447 | mmc->max_blk_size = 512; | 447 | mmc->max_blk_size = 512; |
448 | 448 | ||
449 | /* reset the controler */ | 449 | /* reset the controller */ |
450 | if (sdricoh_reset(host)) { | 450 | if (sdricoh_reset(host)) { |
451 | dev_dbg(dev, "could not reset\n"); | 451 | dev_dbg(dev, "could not reset\n"); |
452 | result = -EIO; | 452 | result = -EIO; |
@@ -478,7 +478,7 @@ static int sdricoh_pcmcia_probe(struct pcmcia_device *pcmcia_dev) | |||
478 | dev_info(&pcmcia_dev->dev, "Searching MMC controller for pcmcia device" | 478 | dev_info(&pcmcia_dev->dev, "Searching MMC controller for pcmcia device" |
479 | " %s %s ...\n", pcmcia_dev->prod_id[0], pcmcia_dev->prod_id[1]); | 479 | " %s %s ...\n", pcmcia_dev->prod_id[0], pcmcia_dev->prod_id[1]); |
480 | 480 | ||
481 | /* search pci cardbus bridge that contains the mmc controler */ | 481 | /* search pci cardbus bridge that contains the mmc controller */ |
482 | /* the io region is already claimed by yenta_socket... */ | 482 | /* the io region is already claimed by yenta_socket... */ |
483 | while ((pci_dev = | 483 | while ((pci_dev = |
484 | pci_get_device(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, | 484 | pci_get_device(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, |
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 1f75a1b1f7c3..31bf376b82a0 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -821,7 +821,7 @@ retry: | |||
821 | * | 821 | * |
822 | * Wait for command done. This is a helper function for nand_wait used when | 822 | * Wait for command done. This is a helper function for nand_wait used when |
823 | * we are in interrupt context. May happen when in panic and trying to write | 823 | * we are in interrupt context. May happen when in panic and trying to write |
824 | * an oops trough mtdoops. | 824 | * an oops through mtdoops. |
825 | */ | 825 | */ |
826 | static void panic_nand_wait(struct mtd_info *mtd, struct nand_chip *chip, | 826 | static void panic_nand_wait(struct mtd_info *mtd, struct nand_chip *chip, |
827 | unsigned long timeo) | 827 | unsigned long timeo) |
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 6a858a29db56..a6cd335c9436 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h | |||
@@ -1415,12 +1415,12 @@ struct bnx2x_func_init_params { | |||
1415 | else | 1415 | else |
1416 | 1416 | ||
1417 | /* skip rx queue | 1417 | /* skip rx queue |
1418 | * if FCOE l2 support is diabled and this is the fcoe L2 queue | 1418 | * if FCOE l2 support is disabled and this is the fcoe L2 queue |
1419 | */ | 1419 | */ |
1420 | #define skip_rx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) | 1420 | #define skip_rx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) |
1421 | 1421 | ||
1422 | /* skip tx queue | 1422 | /* skip tx queue |
1423 | * if FCOE l2 support is diabled and this is the fcoe L2 queue | 1423 | * if FCOE l2 support is disabled and this is the fcoe L2 queue |
1424 | */ | 1424 | */ |
1425 | #define skip_tx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) | 1425 | #define skip_tx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) |
1426 | 1426 | ||
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 84e1af4d65e1..8cdcf5b39d1e 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c | |||
@@ -5037,7 +5037,7 @@ static int bnx2x_init_hw_common(struct bnx2x *bp, u32 load_code) | |||
5037 | memset(&ilt_cli, 0, sizeof(struct ilt_client_info)); | 5037 | memset(&ilt_cli, 0, sizeof(struct ilt_client_info)); |
5038 | memset(&ilt, 0, sizeof(struct bnx2x_ilt)); | 5038 | memset(&ilt, 0, sizeof(struct bnx2x_ilt)); |
5039 | 5039 | ||
5040 | /* initalize dummy TM client */ | 5040 | /* initialize dummy TM client */ |
5041 | ilt_cli.start = 0; | 5041 | ilt_cli.start = 0; |
5042 | ilt_cli.end = ILT_NUM_PAGE_ENTRIES - 1; | 5042 | ilt_cli.end = ILT_NUM_PAGE_ENTRIES - 1; |
5043 | ilt_cli.client_num = ILT_CLIENT_TM; | 5043 | ilt_cli.client_num = ILT_CLIENT_TM; |
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h index 38ef7ca9f21d..c939683e3d61 100644 --- a/drivers/net/bnx2x/bnx2x_reg.h +++ b/drivers/net/bnx2x/bnx2x_reg.h | |||
@@ -1633,7 +1633,7 @@ | |||
1633 | (~misc_registers_sw_timer_cfg_4.sw_timer_cfg_4[1] ) is set */ | 1633 | (~misc_registers_sw_timer_cfg_4.sw_timer_cfg_4[1] ) is set */ |
1634 | #define MISC_REG_SW_TIMER_RELOAD_VAL_4 0xa2fc | 1634 | #define MISC_REG_SW_TIMER_RELOAD_VAL_4 0xa2fc |
1635 | /* [RW 32] the value of the counter for sw timers1-8. there are 8 addresses | 1635 | /* [RW 32] the value of the counter for sw timers1-8. there are 8 addresses |
1636 | in this register. addres 0 - timer 1; address 1 - timer 2, ... address 7 - | 1636 | in this register. address 0 - timer 1; address 1 - timer 2, ... address 7 - |
1637 | timer 8 */ | 1637 | timer 8 */ |
1638 | #define MISC_REG_SW_TIMER_VAL 0xa5c0 | 1638 | #define MISC_REG_SW_TIMER_VAL 0xa5c0 |
1639 | /* [RW 1] Set by the MCP to remember if one or more of the drivers is/are | 1639 | /* [RW 1] Set by the MCP to remember if one or more of the drivers is/are |
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 48cf24ff4e6f..171782e2bb39 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
@@ -840,7 +840,7 @@ static int ad_lacpdu_send(struct port *port) | |||
840 | lacpdu_header = (struct lacpdu_header *)skb_put(skb, length); | 840 | lacpdu_header = (struct lacpdu_header *)skb_put(skb, length); |
841 | 841 | ||
842 | memcpy(lacpdu_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); | 842 | memcpy(lacpdu_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); |
843 | /* Note: source addres is set to be the member's PERMANENT address, | 843 | /* Note: source address is set to be the member's PERMANENT address, |
844 | because we use it to identify loopback lacpdus in receive. */ | 844 | because we use it to identify loopback lacpdus in receive. */ |
845 | memcpy(lacpdu_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); | 845 | memcpy(lacpdu_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); |
846 | lacpdu_header->hdr.h_proto = PKT_TYPE_LACPDU; | 846 | lacpdu_header->hdr.h_proto = PKT_TYPE_LACPDU; |
@@ -881,7 +881,7 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker) | |||
881 | marker_header = (struct bond_marker_header *)skb_put(skb, length); | 881 | marker_header = (struct bond_marker_header *)skb_put(skb, length); |
882 | 882 | ||
883 | memcpy(marker_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); | 883 | memcpy(marker_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); |
884 | /* Note: source addres is set to be the member's PERMANENT address, | 884 | /* Note: source address is set to be the member's PERMANENT address, |
885 | because we use it to identify loopback MARKERs in receive. */ | 885 | because we use it to identify loopback MARKERs in receive. */ |
886 | memcpy(marker_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); | 886 | memcpy(marker_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); |
887 | marker_header->hdr.h_proto = PKT_TYPE_LACPDU; | 887 | marker_header->hdr.h_proto = PKT_TYPE_LACPDU; |
@@ -1916,7 +1916,7 @@ int bond_3ad_bind_slave(struct slave *slave) | |||
1916 | return -1; | 1916 | return -1; |
1917 | } | 1917 | } |
1918 | 1918 | ||
1919 | //check that the slave has not been intialized yet. | 1919 | //check that the slave has not been initialized yet. |
1920 | if (SLAVE_AD_INFO(slave).port.slave != slave) { | 1920 | if (SLAVE_AD_INFO(slave).port.slave != slave) { |
1921 | 1921 | ||
1922 | // port initialization | 1922 | // port initialization |
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c index 63ebf76d2390..8a43c7e19701 100644 --- a/drivers/net/chelsio/subr.c +++ b/drivers/net/chelsio/subr.c | |||
@@ -556,7 +556,7 @@ struct chelsio_vpd_t { | |||
556 | #define EEPROM_MAX_POLL 4 | 556 | #define EEPROM_MAX_POLL 4 |
557 | 557 | ||
558 | /* | 558 | /* |
559 | * Read SEEPROM. A zero is written to the flag register when the addres is | 559 | * Read SEEPROM. A zero is written to the flag register when the address is |
560 | * written to the Control register. The hardware device will set the flag to a | 560 | * written to the Control register. The hardware device will set the flag to a |
561 | * one when 4B have been transferred to the Data register. | 561 | * one when 4B have been transferred to the Data register. |
562 | */ | 562 | */ |
diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/cxgb3/mc5.c index a8766fb2f9ab..e13b7fe9d082 100644 --- a/drivers/net/cxgb3/mc5.c +++ b/drivers/net/cxgb3/mc5.c | |||
@@ -318,7 +318,7 @@ static void mc5_dbgi_mode_disable(const struct mc5 *mc5) | |||
318 | 318 | ||
319 | /* | 319 | /* |
320 | * Initialization that requires the OS and protocol layers to already | 320 | * Initialization that requires the OS and protocol layers to already |
321 | * be intialized goes here. | 321 | * be initialized goes here. |
322 | */ | 322 | */ |
323 | int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters, | 323 | int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters, |
324 | unsigned int nroutes) | 324 | unsigned int nroutes) |
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index ec8579a0a808..d55db6b38e7b 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c | |||
@@ -607,7 +607,7 @@ struct t3_vpd { | |||
607 | * | 607 | * |
608 | * Read a 32-bit word from a location in VPD EEPROM using the card's PCI | 608 | * Read a 32-bit word from a location in VPD EEPROM using the card's PCI |
609 | * VPD ROM capability. A zero is written to the flag bit when the | 609 | * VPD ROM capability. A zero is written to the flag bit when the |
610 | * addres is written to the control register. The hardware device will | 610 | * address is written to the control register. The hardware device will |
611 | * set the flag to 1 when 4 bytes have been read into the data register. | 611 | * set the flag to 1 when 4 bytes have been read into the data register. |
612 | */ | 612 | */ |
613 | int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data) | 613 | int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data) |
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index f5514a0d5be6..196eeda2dd6c 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
@@ -41,7 +41,7 @@ struct e1000_hw; | |||
41 | struct e1000_hw_stats; | 41 | struct e1000_hw_stats; |
42 | 42 | ||
43 | /* Enumerated types specific to the e1000 hardware */ | 43 | /* Enumerated types specific to the e1000 hardware */ |
44 | /* Media Access Controlers */ | 44 | /* Media Access Controllers */ |
45 | typedef enum { | 45 | typedef enum { |
46 | e1000_undefined = 0, | 46 | e1000_undefined = 0, |
47 | e1000_82542_rev2_0, | 47 | e1000_82542_rev2_0, |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 4ff88a683f61..de69c54301c1 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -2233,7 +2233,7 @@ static void e1000_set_rx_mode(struct net_device *netdev) | |||
2233 | * addresses take precedence to avoid disabling unicast filtering | 2233 | * addresses take precedence to avoid disabling unicast filtering |
2234 | * when possible. | 2234 | * when possible. |
2235 | * | 2235 | * |
2236 | * RAR 0 is used for the station MAC adddress | 2236 | * RAR 0 is used for the station MAC address |
2237 | * if there are not 14 addresses, go ahead and clear the filters | 2237 | * if there are not 14 addresses, go ahead and clear the filters |
2238 | */ | 2238 | */ |
2239 | i = 1; | 2239 | i = 1; |
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index cb6c7b1c1fb8..1397da118f0d 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c | |||
@@ -328,7 +328,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) | |||
328 | 328 | ||
329 | /* | 329 | /* |
330 | * Ensure that the inter-port SWSM.SMBI lock bit is clear before | 330 | * Ensure that the inter-port SWSM.SMBI lock bit is clear before |
331 | * first NVM or PHY acess. This should be done for single-port | 331 | * first NVM or PHY access. This should be done for single-port |
332 | * devices, and for one port only on dual-port devices so that | 332 | * devices, and for one port only on dual-port devices so that |
333 | * for those devices we can still use the SMBI lock to synchronize | 333 | * for those devices we can still use the SMBI lock to synchronize |
334 | * inter-port accesses to the PHY & NVM. | 334 | * inter-port accesses to the PHY & NVM. |
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 5328a2927731..5bb65b7382db 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c | |||
@@ -321,7 +321,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) | |||
321 | } | 321 | } |
322 | 322 | ||
323 | /* | 323 | /* |
324 | * Reset the PHY before any acccess to it. Doing so, ensures that | 324 | * Reset the PHY before any access to it. Doing so, ensures that |
325 | * the PHY is in a known good state before we read/write PHY registers. | 325 | * the PHY is in a known good state before we read/write PHY registers. |
326 | * The generic reset is sufficient here, because we haven't determined | 326 | * The generic reset is sufficient here, because we haven't determined |
327 | * the PHY type yet. | 327 | * the PHY type yet. |
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c index a640f1c369ae..00f89e8a9fa0 100644 --- a/drivers/net/e1000e/phy.c +++ b/drivers/net/e1000e/phy.c | |||
@@ -2986,7 +2986,7 @@ s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 data) | |||
2986 | } | 2986 | } |
2987 | 2987 | ||
2988 | /** | 2988 | /** |
2989 | * e1000_get_phy_addr_for_hv_page - Get PHY adrress based on page | 2989 | * e1000_get_phy_addr_for_hv_page - Get PHY address based on page |
2990 | * @page: page to be accessed | 2990 | * @page: page to be accessed |
2991 | **/ | 2991 | **/ |
2992 | static u32 e1000_get_phy_addr_for_hv_page(u32 page) | 2992 | static u32 e1000_get_phy_addr_for_hv_page(u32 page) |
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 4fa8d2a4aef3..eb35951a2442 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -1761,7 +1761,7 @@ module_param_array(io, int, NULL, 0); | |||
1761 | module_param_array(irq, int, NULL, 0); | 1761 | module_param_array(irq, int, NULL, 0); |
1762 | module_param_array(mem, int, NULL, 0); | 1762 | module_param_array(mem, int, NULL, 0); |
1763 | module_param(autodetect, int, 0); | 1763 | module_param(autodetect, int, 0); |
1764 | MODULE_PARM_DESC(io, "EtherExpress Pro/10 I/O base addres(es)"); | 1764 | MODULE_PARM_DESC(io, "EtherExpress Pro/10 I/O base address(es)"); |
1765 | MODULE_PARM_DESC(irq, "EtherExpress Pro/10 IRQ number(s)"); | 1765 | MODULE_PARM_DESC(irq, "EtherExpress Pro/10 IRQ number(s)"); |
1766 | MODULE_PARM_DESC(mem, "EtherExpress Pro/10 Rx buffer size(es) in kB (3-29)"); | 1766 | MODULE_PARM_DESC(mem, "EtherExpress Pro/10 Rx buffer size(es) in kB (3-29)"); |
1767 | MODULE_PARM_DESC(autodetect, "EtherExpress Pro/10 force board(s) detection (0-1)"); | 1767 | MODULE_PARM_DESC(autodetect, "EtherExpress Pro/10 force board(s) detection (0-1)"); |
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h index 4dc39e5f0156..77fcf4459161 100644 --- a/drivers/net/irda/donauboe.h +++ b/drivers/net/irda/donauboe.h | |||
@@ -30,7 +30,7 @@ | |||
30 | * or the type-DO IR port. | 30 | * or the type-DO IR port. |
31 | * | 31 | * |
32 | * IrDA chip set list from Toshiba Computer Engineering Corp. | 32 | * IrDA chip set list from Toshiba Computer Engineering Corp. |
33 | * model method maker controler Version | 33 | * model method maker controller Version |
34 | * Portege 320CT FIR,SIR Toshiba Oboe(Triangle) | 34 | * Portege 320CT FIR,SIR Toshiba Oboe(Triangle) |
35 | * Portege 3010CT FIR,SIR Toshiba Oboe(Sydney) | 35 | * Portege 3010CT FIR,SIR Toshiba Oboe(Sydney) |
36 | * Portege 3015CT FIR,SIR Toshiba Oboe(Sydney) | 36 | * Portege 3015CT FIR,SIR Toshiba Oboe(Sydney) |
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index 8d316d9cd29d..a21f5817685b 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c | |||
@@ -1079,7 +1079,7 @@ s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc) | |||
1079 | 1079 | ||
1080 | /* | 1080 | /* |
1081 | * The defaults in the HW for RX PB 1-7 are not zero and so should be | 1081 | * The defaults in the HW for RX PB 1-7 are not zero and so should be |
1082 | * intialized to zero for non DCB mode otherwise actual total RX PB | 1082 | * initialized to zero for non DCB mode otherwise actual total RX PB |
1083 | * would be bigger than programmed and filter space would run into | 1083 | * would be bigger than programmed and filter space would run into |
1084 | * the PB 0 region. | 1084 | * the PB 0 region. |
1085 | */ | 1085 | */ |
@@ -1167,7 +1167,7 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc) | |||
1167 | 1167 | ||
1168 | /* | 1168 | /* |
1169 | * The defaults in the HW for RX PB 1-7 are not zero and so should be | 1169 | * The defaults in the HW for RX PB 1-7 are not zero and so should be |
1170 | * intialized to zero for non DCB mode otherwise actual total RX PB | 1170 | * initialized to zero for non DCB mode otherwise actual total RX PB |
1171 | * would be bigger than programmed and filter space would run into | 1171 | * would be bigger than programmed and filter space would run into |
1172 | * the PB 0 region. | 1172 | * the PB 0 region. |
1173 | */ | 1173 | */ |
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index 183765cb7f25..f35554d11441 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
@@ -238,7 +238,7 @@ static int temac_dma_bd_init(struct net_device *ndev) | |||
238 | goto out; | 238 | goto out; |
239 | } | 239 | } |
240 | /* allocate the tx and rx ring buffer descriptors. */ | 240 | /* allocate the tx and rx ring buffer descriptors. */ |
241 | /* returns a virtual addres and a physical address. */ | 241 | /* returns a virtual address and a physical address. */ |
242 | lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, | 242 | lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, |
243 | sizeof(*lp->tx_bd_v) * TX_BD_NUM, | 243 | sizeof(*lp->tx_bd_v) * TX_BD_NUM, |
244 | &lp->tx_bd_p, GFP_KERNEL); | 244 | &lp->tx_bd_p, GFP_KERNEL); |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 581836867098..5976d1d51df1 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -36,7 +36,7 @@ | |||
36 | Rev 1.07.06 Nov. 7 2000 Jeff Garzik <jgarzik@pobox.com> some bug fix and cleaning | 36 | Rev 1.07.06 Nov. 7 2000 Jeff Garzik <jgarzik@pobox.com> some bug fix and cleaning |
37 | Rev 1.07.05 Nov. 6 2000 metapirat<metapirat@gmx.de> contribute media type select by ifconfig | 37 | Rev 1.07.05 Nov. 6 2000 metapirat<metapirat@gmx.de> contribute media type select by ifconfig |
38 | Rev 1.07.04 Sep. 6 2000 Lei-Chun Chang added ICS1893 PHY support | 38 | Rev 1.07.04 Sep. 6 2000 Lei-Chun Chang added ICS1893 PHY support |
39 | Rev 1.07.03 Aug. 24 2000 Lei-Chun Chang (lcchang@sis.com.tw) modified 630E eqaulizer workaround rule | 39 | Rev 1.07.03 Aug. 24 2000 Lei-Chun Chang (lcchang@sis.com.tw) modified 630E equalizer workaround rule |
40 | Rev 1.07.01 Aug. 08 2000 Ollie Lho minor update for SiS 630E and SiS 630E A1 | 40 | Rev 1.07.01 Aug. 08 2000 Ollie Lho minor update for SiS 630E and SiS 630E A1 |
41 | Rev 1.07 Mar. 07 2000 Ollie Lho bug fix in Rx buffer ring | 41 | Rev 1.07 Mar. 07 2000 Ollie Lho bug fix in Rx buffer ring |
42 | Rev 1.06.04 Feb. 11 2000 Jeff Garzik <jgarzik@pobox.com> softnet and init for kernel 2.4 | 42 | Rev 1.06.04 Feb. 11 2000 Jeff Garzik <jgarzik@pobox.com> softnet and init for kernel 2.4 |
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 296000bf5a25..3397618d4d96 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -12,7 +12,7 @@ | |||
12 | /* | 12 | /* |
13 | * RX HW/SW interaction overview | 13 | * RX HW/SW interaction overview |
14 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 14 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
15 | * There are 2 types of RX communication channels betwean driver and NIC. | 15 | * There are 2 types of RX communication channels between driver and NIC. |
16 | * 1) RX Free Fifo - RXF - holds descriptors of empty buffers to accept incoming | 16 | * 1) RX Free Fifo - RXF - holds descriptors of empty buffers to accept incoming |
17 | * traffic. This Fifo is filled by SW and is readen by HW. Each descriptor holds | 17 | * traffic. This Fifo is filled by SW and is readen by HW. Each descriptor holds |
18 | * info about buffer's location, size and ID. An ID field is used to identify a | 18 | * info about buffer's location, size and ID. An ID field is used to identify a |
@@ -821,7 +821,7 @@ static void bdx_setmulti(struct net_device *ndev) | |||
821 | } | 821 | } |
822 | 822 | ||
823 | /* use PMF to accept first MAC_MCST_NUM (15) addresses */ | 823 | /* use PMF to accept first MAC_MCST_NUM (15) addresses */ |
824 | /* TBD: sort addreses and write them in ascending order | 824 | /* TBD: sort addresses and write them in ascending order |
825 | * into RX_MAC_MCST regs. we skip this phase now and accept ALL | 825 | * into RX_MAC_MCST regs. we skip this phase now and accept ALL |
826 | * multicast frames throu IMF */ | 826 | * multicast frames throu IMF */ |
827 | /* accept the rest of addresses throu IMF */ | 827 | /* accept the rest of addresses throu IMF */ |
@@ -1346,7 +1346,7 @@ static void print_rxfd(struct rxf_desc *rxfd) | |||
1346 | /* | 1346 | /* |
1347 | * TX HW/SW interaction overview | 1347 | * TX HW/SW interaction overview |
1348 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 1348 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
1349 | * There are 2 types of TX communication channels betwean driver and NIC. | 1349 | * There are 2 types of TX communication channels between driver and NIC. |
1350 | * 1) TX Free Fifo - TXF - holds ack descriptors for sent packets | 1350 | * 1) TX Free Fifo - TXF - holds ack descriptors for sent packets |
1351 | * 2) TX Data Fifo - TXD - holds descriptors of full buffers. | 1351 | * 2) TX Data Fifo - TXD - holds descriptors of full buffers. |
1352 | * | 1352 | * |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 7599c457abd1..b100bd50a0d7 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
@@ -1309,7 +1309,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, | |||
1309 | break; | 1309 | break; |
1310 | 1310 | ||
1311 | case SIOCGIFHWADDR: | 1311 | case SIOCGIFHWADDR: |
1312 | /* Get hw addres */ | 1312 | /* Get hw address */ |
1313 | memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN); | 1313 | memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN); |
1314 | ifr.ifr_hwaddr.sa_family = tun->dev->type; | 1314 | ifr.ifr_hwaddr.sa_family = tun->dev->type; |
1315 | if (copy_to_user(argp, &ifr, ifreq_len)) | 1315 | if (copy_to_user(argp, &ifr, ifreq_len)) |
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index cab96ad49e60..09cac704fdd7 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -898,7 +898,7 @@ static int velocity_set_media_mode(struct velocity_info *vptr, u32 mii_status) | |||
898 | set_mii_flow_control(vptr); | 898 | set_mii_flow_control(vptr); |
899 | 899 | ||
900 | /* | 900 | /* |
901 | Check if new status is consisent with current status | 901 | Check if new status is consistent with current status |
902 | if (((mii_status & curr_status) & VELOCITY_AUTONEG_ENABLE) || | 902 | if (((mii_status & curr_status) & VELOCITY_AUTONEG_ENABLE) || |
903 | (mii_status==curr_status)) { | 903 | (mii_status==curr_status)) { |
904 | vptr->mii_status=mii_check_media_mode(vptr->mac_regs); | 904 | vptr->mii_status=mii_check_media_mode(vptr->mac_regs); |
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h index 8c3103fb6442..d48486d6afa1 100644 --- a/drivers/net/vxge/vxge-traffic.h +++ b/drivers/net/vxge/vxge-traffic.h | |||
@@ -1695,7 +1695,7 @@ struct vxge_hw_device_stats_sw_err { | |||
1695 | * struct vxge_hw_device_stats - Contains HW per-device statistics, | 1695 | * struct vxge_hw_device_stats - Contains HW per-device statistics, |
1696 | * including hw. | 1696 | * including hw. |
1697 | * @devh: HW device handle. | 1697 | * @devh: HW device handle. |
1698 | * @dma_addr: DMA addres of the %hw_info. Given to device to fill-in the stats. | 1698 | * @dma_addr: DMA address of the %hw_info. Given to device to fill-in the stats. |
1699 | * @hw_info_dmah: DMA handle used to map hw statistics onto the device memory | 1699 | * @hw_info_dmah: DMA handle used to map hw statistics onto the device memory |
1700 | * space. | 1700 | * space. |
1701 | * @hw_info_dma_acch: One more DMA handle used subsequently to free the | 1701 | * @hw_info_dma_acch: One more DMA handle used subsequently to free the |
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 34cff6ce6d27..4578e5b4b411 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
@@ -125,7 +125,7 @@ static u32 dscc4_pci_config_store[16]; | |||
125 | /* Module parameters */ | 125 | /* Module parameters */ |
126 | 126 | ||
127 | MODULE_AUTHOR("Maintainer: Francois Romieu <romieu@cogenit.fr>"); | 127 | MODULE_AUTHOR("Maintainer: Francois Romieu <romieu@cogenit.fr>"); |
128 | MODULE_DESCRIPTION("Siemens PEB20534 PCI Controler"); | 128 | MODULE_DESCRIPTION("Siemens PEB20534 PCI Controller"); |
129 | MODULE_LICENSE("GPL"); | 129 | MODULE_LICENSE("GPL"); |
130 | module_param(debug, int, 0); | 130 | module_param(debug, int, 0); |
131 | MODULE_PARM_DESC(debug,"Enable/disable extra messages"); | 131 | MODULE_PARM_DESC(debug,"Enable/disable extra messages"); |
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index f0603327aafa..65bc334ed57b 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c | |||
@@ -232,7 +232,7 @@ int i2400m_check_mac_addr(struct i2400m *i2400m) | |||
232 | result); | 232 | result); |
233 | goto error; | 233 | goto error; |
234 | } | 234 | } |
235 | /* Extract MAC addresss */ | 235 | /* Extract MAC address */ |
236 | ddi = (void *) skb->data; | 236 | ddi = (void *) skb->data; |
237 | BUILD_BUG_ON(ETH_ALEN != sizeof(ddi->mac_address)); | 237 | BUILD_BUG_ON(ETH_ALEN != sizeof(ddi->mac_address)); |
238 | d_printf(2, dev, "GET DEVICE INFO: mac addr %pM\n", | 238 | d_printf(2, dev, "GET DEVICE INFO: mac addr %pM\n", |
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index 17ecaa41a807..030cbfd31704 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h | |||
@@ -186,7 +186,7 @@ enum { | |||
186 | * struct i2400m_poke_table - Hardware poke table for the Intel 2400m | 186 | * struct i2400m_poke_table - Hardware poke table for the Intel 2400m |
187 | * | 187 | * |
188 | * This structure will be used to create a device specific poke table | 188 | * This structure will be used to create a device specific poke table |
189 | * to put the device in a consistant state at boot time. | 189 | * to put the device in a consistent state at boot time. |
190 | * | 190 | * |
191 | * @address: The device address to poke | 191 | * @address: The device address to poke |
192 | * | 192 | * |
@@ -703,7 +703,7 @@ enum i2400m_bm_cmd_flags { | |||
703 | * @I2400M_BRI_MAC_REINIT: We need to reinitialize the boot | 703 | * @I2400M_BRI_MAC_REINIT: We need to reinitialize the boot |
704 | * rom after reading the MAC address. This is quite a dirty hack, | 704 | * rom after reading the MAC address. This is quite a dirty hack, |
705 | * if you ask me -- the device requires the bootrom to be | 705 | * if you ask me -- the device requires the bootrom to be |
706 | * intialized after reading the MAC address. | 706 | * initialized after reading the MAC address. |
707 | */ | 707 | */ |
708 | enum i2400m_bri { | 708 | enum i2400m_bri { |
709 | I2400M_BRI_SOFT = 1 << 1, | 709 | I2400M_BRI_SOFT = 1 << 1, |
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h index 7ad05d401ab5..fd14b9103951 100644 --- a/drivers/net/wireless/ath/ath5k/reg.h +++ b/drivers/net/wireless/ath/ath5k/reg.h | |||
@@ -1064,7 +1064,7 @@ | |||
1064 | /* | 1064 | /* |
1065 | * EEPROM command register | 1065 | * EEPROM command register |
1066 | */ | 1066 | */ |
1067 | #define AR5K_EEPROM_CMD 0x6008 /* Register Addres */ | 1067 | #define AR5K_EEPROM_CMD 0x6008 /* Register Address */ |
1068 | #define AR5K_EEPROM_CMD_READ 0x00000001 /* EEPROM read */ | 1068 | #define AR5K_EEPROM_CMD_READ 0x00000001 /* EEPROM read */ |
1069 | #define AR5K_EEPROM_CMD_WRITE 0x00000002 /* EEPROM write */ | 1069 | #define AR5K_EEPROM_CMD_WRITE 0x00000002 /* EEPROM write */ |
1070 | #define AR5K_EEPROM_CMD_RESET 0x00000004 /* EEPROM reset */ | 1070 | #define AR5K_EEPROM_CMD_RESET 0x00000004 /* EEPROM reset */ |
@@ -1084,7 +1084,7 @@ | |||
1084 | /* | 1084 | /* |
1085 | * EEPROM config register | 1085 | * EEPROM config register |
1086 | */ | 1086 | */ |
1087 | #define AR5K_EEPROM_CFG 0x6010 /* Register Addres */ | 1087 | #define AR5K_EEPROM_CFG 0x6010 /* Register Address */ |
1088 | #define AR5K_EEPROM_CFG_SIZE 0x00000003 /* Size determination override */ | 1088 | #define AR5K_EEPROM_CFG_SIZE 0x00000003 /* Size determination override */ |
1089 | #define AR5K_EEPROM_CFG_SIZE_AUTO 0 | 1089 | #define AR5K_EEPROM_CFG_SIZE_AUTO 0 |
1090 | #define AR5K_EEPROM_CFG_SIZE_4KBIT 1 | 1090 | #define AR5K_EEPROM_CFG_SIZE_4KBIT 1 |
@@ -1126,7 +1126,7 @@ | |||
1126 | * Second station id register (Upper 16 bits of MAC address + PCU settings) | 1126 | * Second station id register (Upper 16 bits of MAC address + PCU settings) |
1127 | */ | 1127 | */ |
1128 | #define AR5K_STA_ID1 0x8004 /* Register Address */ | 1128 | #define AR5K_STA_ID1 0x8004 /* Register Address */ |
1129 | #define AR5K_STA_ID1_ADDR_U16 0x0000ffff /* Upper 16 bits of MAC addres */ | 1129 | #define AR5K_STA_ID1_ADDR_U16 0x0000ffff /* Upper 16 bits of MAC address */ |
1130 | #define AR5K_STA_ID1_AP 0x00010000 /* Set AP mode */ | 1130 | #define AR5K_STA_ID1_AP 0x00010000 /* Set AP mode */ |
1131 | #define AR5K_STA_ID1_ADHOC 0x00020000 /* Set Ad-Hoc mode */ | 1131 | #define AR5K_STA_ID1_ADHOC 0x00020000 /* Set Ad-Hoc mode */ |
1132 | #define AR5K_STA_ID1_PWR_SV 0x00040000 /* Power save reporting */ | 1132 | #define AR5K_STA_ID1_PWR_SV 0x00040000 /* Power save reporting */ |
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c index 0dc33b65e86b..be4828167012 100644 --- a/drivers/net/wireless/b43/phy_g.c +++ b/drivers/net/wireless/b43/phy_g.c | |||
@@ -1919,7 +1919,7 @@ static void b43_hardware_pctl_init_gphy(struct b43_wldev *dev) | |||
1919 | b43_hf_write(dev, b43_hf_read(dev) | B43_HF_HWPCTL); | 1919 | b43_hf_write(dev, b43_hf_read(dev) | B43_HF_HWPCTL); |
1920 | } | 1920 | } |
1921 | 1921 | ||
1922 | /* Intialize B/G PHY power control */ | 1922 | /* Initialize B/G PHY power control */ |
1923 | static void b43_phy_init_pctl(struct b43_wldev *dev) | 1923 | static void b43_phy_init_pctl(struct b43_wldev *dev) |
1924 | { | 1924 | { |
1925 | struct ssb_bus *bus = dev->dev->bus; | 1925 | struct ssb_bus *bus = dev->dev->bus; |
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c index 35033dd342ce..28e477d01587 100644 --- a/drivers/net/wireless/b43legacy/phy.c +++ b/drivers/net/wireless/b43legacy/phy.c | |||
@@ -153,7 +153,7 @@ void b43legacy_phy_calibrate(struct b43legacy_wldev *dev) | |||
153 | phy->calibrated = 1; | 153 | phy->calibrated = 1; |
154 | } | 154 | } |
155 | 155 | ||
156 | /* intialize B PHY power control | 156 | /* initialize B PHY power control |
157 | * as described in http://bcm-specs.sipsolutions.net/InitPowerControl | 157 | * as described in http://bcm-specs.sipsolutions.net/InitPowerControl |
158 | */ | 158 | */ |
159 | static void b43legacy_phy_init_pctl(struct b43legacy_wldev *dev) | 159 | static void b43legacy_phy_init_pctl(struct b43legacy_wldev *dev) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c index a5dbfea1bfad..b5cb3be0eb4b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c | |||
@@ -197,7 +197,7 @@ static irqreturn_t iwl_isr(int irq, void *data) | |||
197 | 197 | ||
198 | none: | 198 | none: |
199 | /* re-enable interrupts here since we don't have anything to service. */ | 199 | /* re-enable interrupts here since we don't have anything to service. */ |
200 | /* only Re-enable if diabled by irq and no schedules tasklet. */ | 200 | /* only Re-enable if disabled by irq and no schedules tasklet. */ |
201 | if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta) | 201 | if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta) |
202 | iwl_enable_interrupts(priv); | 202 | iwl_enable_interrupts(priv); |
203 | 203 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index f13a83a7e62b..36335b1b54d4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1154,7 +1154,7 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv) | |||
1154 | } | 1154 | } |
1155 | 1155 | ||
1156 | /* Re-enable all interrupts */ | 1156 | /* Re-enable all interrupts */ |
1157 | /* only Re-enable if diabled by irq */ | 1157 | /* only Re-enable if disabled by irq */ |
1158 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) | 1158 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) |
1159 | iwl_enable_interrupts(priv); | 1159 | iwl_enable_interrupts(priv); |
1160 | 1160 | ||
@@ -1368,7 +1368,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) | |||
1368 | } | 1368 | } |
1369 | 1369 | ||
1370 | /* Re-enable all interrupts */ | 1370 | /* Re-enable all interrupts */ |
1371 | /* only Re-enable if diabled by irq */ | 1371 | /* only Re-enable if disabled by irq */ |
1372 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) | 1372 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) |
1373 | iwl_enable_interrupts(priv); | 1373 | iwl_enable_interrupts(priv); |
1374 | } | 1374 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-legacy.c b/drivers/net/wireless/iwlwifi/iwl-legacy.c index a08b4e56e6b1..bb1a742a98a0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-legacy.c +++ b/drivers/net/wireless/iwlwifi/iwl-legacy.c | |||
@@ -619,7 +619,7 @@ unplugged: | |||
619 | 619 | ||
620 | none: | 620 | none: |
621 | /* re-enable interrupts here since we don't have anything to service. */ | 621 | /* re-enable interrupts here since we don't have anything to service. */ |
622 | /* only Re-enable if diabled by irq */ | 622 | /* only Re-enable if disabled by irq */ |
623 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) | 623 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) |
624 | iwl_enable_interrupts(priv); | 624 | iwl_enable_interrupts(priv); |
625 | spin_unlock_irqrestore(&priv->lock, flags); | 625 | spin_unlock_irqrestore(&priv->lock, flags); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 4776323b1eba..49493d176515 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -107,7 +107,7 @@ static int iwl_process_add_sta_resp(struct iwl_priv *priv, | |||
107 | /* | 107 | /* |
108 | * XXX: The MAC address in the command buffer is often changed from | 108 | * XXX: The MAC address in the command buffer is often changed from |
109 | * the original sent to the device. That is, the MAC address | 109 | * the original sent to the device. That is, the MAC address |
110 | * written to the command buffer often is not the same MAC adress | 110 | * written to the command buffer often is not the same MAC address |
111 | * read from the command buffer when the command returns. This | 111 | * read from the command buffer when the command returns. This |
112 | * issue has not yet been resolved and this debugging is left to | 112 | * issue has not yet been resolved and this debugging is left to |
113 | * observe the problem. | 113 | * observe the problem. |
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 2c8cc954d1b6..ec2c75d77cea 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c | |||
@@ -630,7 +630,7 @@ islpci_alloc_memory(islpci_private *priv) | |||
630 | printk(KERN_DEBUG "islpci_alloc_memory\n"); | 630 | printk(KERN_DEBUG "islpci_alloc_memory\n"); |
631 | #endif | 631 | #endif |
632 | 632 | ||
633 | /* remap the PCI device base address to accessable */ | 633 | /* remap the PCI device base address to accessible */ |
634 | if (!(priv->device_base = | 634 | if (!(priv->device_base = |
635 | ioremap(pci_resource_start(priv->pdev, 0), | 635 | ioremap(pci_resource_start(priv->pdev, 0), |
636 | ISL38XX_PCI_MEM_SIZE))) { | 636 | ISL38XX_PCI_MEM_SIZE))) { |
@@ -709,7 +709,7 @@ islpci_alloc_memory(islpci_private *priv) | |||
709 | PCI_DMA_FROMDEVICE); | 709 | PCI_DMA_FROMDEVICE); |
710 | if (!priv->pci_map_rx_address[counter]) { | 710 | if (!priv->pci_map_rx_address[counter]) { |
711 | /* error mapping the buffer to device | 711 | /* error mapping the buffer to device |
712 | accessable memory address */ | 712 | accessible memory address */ |
713 | printk(KERN_ERR "failed to map skb DMA'able\n"); | 713 | printk(KERN_ERR "failed to map skb DMA'able\n"); |
714 | goto out_free; | 714 | goto out_free; |
715 | } | 715 | } |
@@ -773,7 +773,7 @@ islpci_free_memory(islpci_private *priv) | |||
773 | priv->data_low_rx[counter] = NULL; | 773 | priv->data_low_rx[counter] = NULL; |
774 | } | 774 | } |
775 | 775 | ||
776 | /* Free the acces control list and the WPA list */ | 776 | /* Free the access control list and the WPA list */ |
777 | prism54_acl_clean(&priv->acl); | 777 | prism54_acl_clean(&priv->acl); |
778 | prism54_wpa_bss_ie_clean(priv); | 778 | prism54_wpa_bss_ie_clean(priv); |
779 | mgt_clean(priv); | 779 | mgt_clean(priv); |
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c index 2fc52bc2d7dd..d44f8e20cce0 100644 --- a/drivers/net/wireless/prism54/islpci_eth.c +++ b/drivers/net/wireless/prism54/islpci_eth.c | |||
@@ -450,7 +450,7 @@ islpci_eth_receive(islpci_private *priv) | |||
450 | MAX_FRAGMENT_SIZE_RX + 2, | 450 | MAX_FRAGMENT_SIZE_RX + 2, |
451 | PCI_DMA_FROMDEVICE); | 451 | PCI_DMA_FROMDEVICE); |
452 | if (unlikely(!priv->pci_map_rx_address[index])) { | 452 | if (unlikely(!priv->pci_map_rx_address[index])) { |
453 | /* error mapping the buffer to device accessable memory address */ | 453 | /* error mapping the buffer to device accessible memory address */ |
454 | DEBUG(SHOW_ERROR_MESSAGES, | 454 | DEBUG(SHOW_ERROR_MESSAGES, |
455 | "Error mapping DMA address\n"); | 455 | "Error mapping DMA address\n"); |
456 | 456 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 658542d2efe1..f3da051df39e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -273,7 +273,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw, | |||
273 | intf->beacon = entry; | 273 | intf->beacon = entry; |
274 | 274 | ||
275 | /* | 275 | /* |
276 | * The MAC adddress must be configured after the device | 276 | * The MAC address must be configured after the device |
277 | * has been initialized. Otherwise the device can reset | 277 | * has been initialized. Otherwise the device can reset |
278 | * the MAC registers. | 278 | * the MAC registers. |
279 | * The BSSID address must only be configured in AP mode, | 279 | * The BSSID address must only be configured in AP mode, |
diff --git a/drivers/net/wireless/wl1251/acx.h b/drivers/net/wireless/wl1251/acx.h index e54b21a4f8b1..efcc3aaca14f 100644 --- a/drivers/net/wireless/wl1251/acx.h +++ b/drivers/net/wireless/wl1251/acx.h | |||
@@ -1272,10 +1272,10 @@ struct wl1251_acx_tid_cfg { | |||
1272 | /* OBSOLETE */ | 1272 | /* OBSOLETE */ |
1273 | #define WL1251_ACX_INTR_WAKE_ON_HOST BIT(6) | 1273 | #define WL1251_ACX_INTR_WAKE_ON_HOST BIT(6) |
1274 | 1274 | ||
1275 | /* Trace meassge on MBOX #A */ | 1275 | /* Trace message on MBOX #A */ |
1276 | #define WL1251_ACX_INTR_TRACE_A BIT(7) | 1276 | #define WL1251_ACX_INTR_TRACE_A BIT(7) |
1277 | 1277 | ||
1278 | /* Trace meassge on MBOX #B */ | 1278 | /* Trace message on MBOX #B */ |
1279 | #define WL1251_ACX_INTR_TRACE_B BIT(8) | 1279 | #define WL1251_ACX_INTR_TRACE_B BIT(8) |
1280 | 1280 | ||
1281 | /* Command processing completion */ | 1281 | /* Command processing completion */ |
diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h index 13fbeeccf609..c0ce2c8b43b8 100644 --- a/drivers/net/wireless/wl1251/wl1251.h +++ b/drivers/net/wireless/wl1251/wl1251.h | |||
@@ -419,7 +419,7 @@ void wl1251_disable_interrupts(struct wl1251 *wl); | |||
419 | #define WL1251_FW_NAME "wl1251-fw.bin" | 419 | #define WL1251_FW_NAME "wl1251-fw.bin" |
420 | #define WL1251_NVS_NAME "wl1251-nvs.bin" | 420 | #define WL1251_NVS_NAME "wl1251-nvs.bin" |
421 | 421 | ||
422 | #define WL1251_POWER_ON_SLEEP 10 /* in miliseconds */ | 422 | #define WL1251_POWER_ON_SLEEP 10 /* in milliseconds */ |
423 | 423 | ||
424 | #define WL1251_PART_DOWN_MEM_START 0x0 | 424 | #define WL1251_PART_DOWN_MEM_START 0x0 |
425 | #define WL1251_PART_DOWN_MEM_SIZE 0x16800 | 425 | #define WL1251_PART_DOWN_MEM_SIZE 0x16800 |
diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/wl12xx/acx.h index 9cbc3f40c8dd..7bd8e4db4a71 100644 --- a/drivers/net/wireless/wl12xx/acx.h +++ b/drivers/net/wireless/wl12xx/acx.h | |||
@@ -47,9 +47,9 @@ | |||
47 | #define WL1271_ACX_INTR_HW_AVAILABLE BIT(5) | 47 | #define WL1271_ACX_INTR_HW_AVAILABLE BIT(5) |
48 | /* The MISC bit is used for aggregation of RX, TxComplete and TX rate update */ | 48 | /* The MISC bit is used for aggregation of RX, TxComplete and TX rate update */ |
49 | #define WL1271_ACX_INTR_DATA BIT(6) | 49 | #define WL1271_ACX_INTR_DATA BIT(6) |
50 | /* Trace meassge on MBOX #A */ | 50 | /* Trace message on MBOX #A */ |
51 | #define WL1271_ACX_INTR_TRACE_A BIT(7) | 51 | #define WL1271_ACX_INTR_TRACE_A BIT(7) |
52 | /* Trace meassge on MBOX #B */ | 52 | /* Trace message on MBOX #B */ |
53 | #define WL1271_ACX_INTR_TRACE_B BIT(8) | 53 | #define WL1271_ACX_INTR_TRACE_B BIT(8) |
54 | 54 | ||
55 | #define WL1271_ACX_INTR_ALL 0xFFFFFFFF | 55 | #define WL1271_ACX_INTR_ALL 0xFFFFFFFF |
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h index ce3d31f98c55..9050dd9b62d2 100644 --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/wl12xx/wl12xx.h | |||
@@ -416,8 +416,8 @@ int wl1271_plt_stop(struct wl1271 *wl); | |||
416 | 416 | ||
417 | /* WL1271 needs a 200ms sleep after power on, and a 20ms sleep before power | 417 | /* WL1271 needs a 200ms sleep after power on, and a 20ms sleep before power |
418 | on in case is has been shut down shortly before */ | 418 | on in case is has been shut down shortly before */ |
419 | #define WL1271_PRE_POWER_ON_SLEEP 20 /* in miliseconds */ | 419 | #define WL1271_PRE_POWER_ON_SLEEP 20 /* in milliseconds */ |
420 | #define WL1271_POWER_ON_SLEEP 200 /* in miliseconds */ | 420 | #define WL1271_POWER_ON_SLEEP 200 /* in milliseconds */ |
421 | 421 | ||
422 | /* Macros to handle wl1271.sta_rate_set */ | 422 | /* Macros to handle wl1271.sta_rate_set */ |
423 | #define HW_BG_RATES_MASK 0xffff | 423 | #define HW_BG_RATES_MASK 0xffff |
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index ee82df62e646..3e5befe4d03b 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -192,7 +192,7 @@ static inline void wl3501_switch_page(struct wl3501_card *this, u8 page) | |||
192 | } | 192 | } |
193 | 193 | ||
194 | /* | 194 | /* |
195 | * Get Ethernet MAC addresss. | 195 | * Get Ethernet MAC address. |
196 | * | 196 | * |
197 | * WARNING: We switch to FPAGE0 and switc back again. | 197 | * WARNING: We switch to FPAGE0 and switc back again. |
198 | * Making sure there is no other WL function beening called by ISR. | 198 | * Making sure there is no other WL function beening called by ISR. |
diff --git a/drivers/pcmcia/m32r_cfc.h b/drivers/pcmcia/m32r_cfc.h index 8146e3bee2e8..f558e1adf954 100644 --- a/drivers/pcmcia/m32r_cfc.h +++ b/drivers/pcmcia/m32r_cfc.h | |||
@@ -9,7 +9,7 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | /* | 11 | /* |
12 | * M32R PC Card Controler | 12 | * M32R PC Card Controller |
13 | */ | 13 | */ |
14 | #define M32R_PCC0_BASE 0x00ef7000 | 14 | #define M32R_PCC0_BASE 0x00ef7000 |
15 | #define M32R_PCC1_BASE 0x00ef7020 | 15 | #define M32R_PCC1_BASE 0x00ef7020 |
diff --git a/drivers/pcmcia/m32r_pcc.h b/drivers/pcmcia/m32r_pcc.h index e4fffe417ba9..f95c58563bc8 100644 --- a/drivers/pcmcia/m32r_pcc.h +++ b/drivers/pcmcia/m32r_pcc.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #define M32R_MAX_PCC 2 | 5 | #define M32R_MAX_PCC 2 |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * M32R PC Card Controler | 8 | * M32R PC Card Controller |
9 | */ | 9 | */ |
10 | #define M32R_PCC0_BASE 0x00ef7000 | 10 | #define M32R_PCC0_BASE 0x00ef7000 |
11 | #define M32R_PCC1_BASE 0x00ef7020 | 11 | #define M32R_PCC1_BASE 0x00ef7020 |
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 99d4f23cb435..0db482771fb5 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -1198,7 +1198,7 @@ static int __init m8xx_probe(struct platform_device *ofdev, | |||
1198 | out_be32(M8XX_PGCRX(1), | 1198 | out_be32(M8XX_PGCRX(1), |
1199 | M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16)); | 1199 | M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16)); |
1200 | 1200 | ||
1201 | /* intialize the fixed memory windows */ | 1201 | /* initialize the fixed memory windows */ |
1202 | 1202 | ||
1203 | for (i = 0; i < PCMCIA_SOCKETS_NO; i++) { | 1203 | for (i = 0; i < PCMCIA_SOCKETS_NO; i++) { |
1204 | for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) { | 1204 | for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) { |
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index ee40d681edd0..c5c4b8c32eb8 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c | |||
@@ -1021,7 +1021,7 @@ static int update_bl_status(struct backlight_device *bd) | |||
1021 | return 0; | 1021 | return 0; |
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | static struct backlight_ops acer_bl_ops = { | 1024 | static const struct backlight_ops acer_bl_ops = { |
1025 | .get_brightness = read_brightness, | 1025 | .get_brightness = read_brightness, |
1026 | .update_status = update_bl_status, | 1026 | .update_status = update_bl_status, |
1027 | }; | 1027 | }; |
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index d235f44fd7a3..f3aa6a7fdab6 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c | |||
@@ -640,7 +640,7 @@ static int update_bl_status(struct backlight_device *bd) | |||
640 | return asus_lcd_set(asus, value); | 640 | return asus_lcd_set(asus, value); |
641 | } | 641 | } |
642 | 642 | ||
643 | static struct backlight_ops asusbl_ops = { | 643 | static const struct backlight_ops asusbl_ops = { |
644 | .get_brightness = asus_read_brightness, | 644 | .get_brightness = asus_read_brightness, |
645 | .update_status = update_bl_status, | 645 | .update_status = update_bl_status, |
646 | }; | 646 | }; |
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c index ca05aefd03bf..4633fd8532cc 100644 --- a/drivers/platform/x86/asus_acpi.c +++ b/drivers/platform/x86/asus_acpi.c | |||
@@ -1467,7 +1467,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type) | |||
1467 | return 0; | 1467 | return 0; |
1468 | } | 1468 | } |
1469 | 1469 | ||
1470 | static struct backlight_ops asus_backlight_data = { | 1470 | static const struct backlight_ops asus_backlight_data = { |
1471 | .get_brightness = read_brightness, | 1471 | .get_brightness = read_brightness, |
1472 | .update_status = set_brightness_status, | 1472 | .update_status = set_brightness_status, |
1473 | }; | 1473 | }; |
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index cf8a89a0d8f5..34657f96b5a5 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c | |||
@@ -546,7 +546,7 @@ out: | |||
546 | return buffer->output[1]; | 546 | return buffer->output[1]; |
547 | } | 547 | } |
548 | 548 | ||
549 | static struct backlight_ops dell_ops = { | 549 | static const struct backlight_ops dell_ops = { |
550 | .get_brightness = dell_get_intensity, | 550 | .get_brightness = dell_get_intensity, |
551 | .update_status = dell_send_intensity, | 551 | .update_status = dell_send_intensity, |
552 | }; | 552 | }; |
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index e9fc530e7dc2..49d9ad708f89 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c | |||
@@ -1126,7 +1126,7 @@ static int update_bl_status(struct backlight_device *bd) | |||
1126 | return set_brightness(bd, bd->props.brightness); | 1126 | return set_brightness(bd, bd->props.brightness); |
1127 | } | 1127 | } |
1128 | 1128 | ||
1129 | static struct backlight_ops eeepcbl_ops = { | 1129 | static const struct backlight_ops eeepcbl_ops = { |
1130 | .get_brightness = read_brightness, | 1130 | .get_brightness = read_brightness, |
1131 | .update_status = update_bl_status, | 1131 | .update_status = update_bl_status, |
1132 | }; | 1132 | }; |
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index ad88b2ec34a1..19e92b2a7f7e 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
@@ -437,7 +437,7 @@ static int bl_update_status(struct backlight_device *b) | |||
437 | return ret; | 437 | return ret; |
438 | } | 438 | } |
439 | 439 | ||
440 | static struct backlight_ops fujitsubl_ops = { | 440 | static const struct backlight_ops fujitsubl_ops = { |
441 | .get_brightness = bl_get_brightness, | 441 | .get_brightness = bl_get_brightness, |
442 | .update_status = bl_update_status, | 442 | .update_status = bl_update_status, |
443 | }; | 443 | }; |
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index b4a95bb2f232..5e83370b0812 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
@@ -858,7 +858,7 @@ static int sony_backlight_get_brightness(struct backlight_device *bd) | |||
858 | } | 858 | } |
859 | 859 | ||
860 | static struct backlight_device *sony_backlight_device; | 860 | static struct backlight_device *sony_backlight_device; |
861 | static struct backlight_ops sony_backlight_ops = { | 861 | static const struct backlight_ops sony_backlight_ops = { |
862 | .update_status = sony_backlight_update_status, | 862 | .update_status = sony_backlight_update_status, |
863 | .get_brightness = sony_backlight_get_brightness, | 863 | .get_brightness = sony_backlight_get_brightness, |
864 | }; | 864 | }; |
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index a974ca383cb9..dd599585c6a9 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
@@ -6110,7 +6110,7 @@ static void tpacpi_brightness_notify_change(void) | |||
6110 | BACKLIGHT_UPDATE_HOTKEY); | 6110 | BACKLIGHT_UPDATE_HOTKEY); |
6111 | } | 6111 | } |
6112 | 6112 | ||
6113 | static struct backlight_ops ibm_backlight_data = { | 6113 | static const struct backlight_ops ibm_backlight_data = { |
6114 | .get_brightness = brightness_get, | 6114 | .get_brightness = brightness_get, |
6115 | .update_status = brightness_update_status, | 6115 | .update_status = brightness_update_status, |
6116 | }; | 6116 | }; |
@@ -7194,7 +7194,7 @@ static struct ibm_struct volume_driver_data = { | |||
7194 | * TPACPI_FAN_WR_ACPI_FANS (X31/X40/X41) | 7194 | * TPACPI_FAN_WR_ACPI_FANS (X31/X40/X41) |
7195 | * | 7195 | * |
7196 | * FIRMWARE BUG: on some models, EC 0x2f might not be initialized at | 7196 | * FIRMWARE BUG: on some models, EC 0x2f might not be initialized at |
7197 | * boot. Apparently the EC does not intialize it, so unless ACPI DSDT | 7197 | * boot. Apparently the EC does not initialize it, so unless ACPI DSDT |
7198 | * does so, its initial value is meaningless (0x07). | 7198 | * does so, its initial value is meaningless (0x07). |
7199 | * | 7199 | * |
7200 | * For firmware bugs, refer to: | 7200 | * For firmware bugs, refer to: |
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 4276da7291b8..209cced786c6 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c | |||
@@ -841,7 +841,7 @@ static void remove_toshiba_proc_entries(void) | |||
841 | remove_proc_entry("version", toshiba_proc_dir); | 841 | remove_proc_entry("version", toshiba_proc_dir); |
842 | } | 842 | } |
843 | 843 | ||
844 | static struct backlight_ops toshiba_backlight_data = { | 844 | static const struct backlight_ops toshiba_backlight_data = { |
845 | .get_brightness = get_lcd, | 845 | .get_brightness = get_lcd, |
846 | .update_status = set_lcd_status, | 846 | .update_status = set_lcd_status, |
847 | }; | 847 | }; |
diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c index fe16b482e912..4a8ae3935b3b 100644 --- a/drivers/power/s3c_adc_battery.c +++ b/drivers/power/s3c_adc_battery.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * iPAQ h1930/h1940/rx1950 battery controler driver | 2 | * iPAQ h1930/h1940/rx1950 battery controller driver |
3 | * Copyright (c) Vasily Khoruzhick | 3 | * Copyright (c) Vasily Khoruzhick |
4 | * Based on h1940_battery.c by Arnaud Patard | 4 | * Based on h1940_battery.c by Arnaud Patard |
5 | * | 5 | * |
@@ -427,5 +427,5 @@ static void __exit s3c_adc_bat_exit(void) | |||
427 | module_exit(s3c_adc_bat_exit); | 427 | module_exit(s3c_adc_bat_exit); |
428 | 428 | ||
429 | MODULE_AUTHOR("Vasily Khoruzhick <anarsoul@gmail.com>"); | 429 | MODULE_AUTHOR("Vasily Khoruzhick <anarsoul@gmail.com>"); |
430 | MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controler driver"); | 430 | MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controller driver"); |
431 | MODULE_LICENSE("GPL"); | 431 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 09e7a053c844..30b2a820e670 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -841,7 +841,7 @@ lcs_notify_lancmd_waiters(struct lcs_card *card, struct lcs_cmd *cmd) | |||
841 | } | 841 | } |
842 | 842 | ||
843 | /** | 843 | /** |
844 | * Emit buffer of a lan comand. | 844 | * Emit buffer of a lan command. |
845 | */ | 845 | */ |
846 | static void | 846 | static void |
847 | lcs_lancmd_timeout(unsigned long data) | 847 | lcs_lancmd_timeout(unsigned long data) |
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c index 46342fee394d..303dde09d294 100644 --- a/drivers/s390/scsi/zfcp_cfdc.c +++ b/drivers/s390/scsi/zfcp_cfdc.c | |||
@@ -317,7 +317,7 @@ static void zfcp_act_eval_err(struct zfcp_adapter *adapter, u32 table) | |||
317 | 317 | ||
318 | /** | 318 | /** |
319 | * zfcp_cfdc_port_denied - Process "access denied" for port | 319 | * zfcp_cfdc_port_denied - Process "access denied" for port |
320 | * @port: The port where the acces has been denied | 320 | * @port: The port where the access has been denied |
321 | * @qual: The FSF status qualifier for the access denied FSF status | 321 | * @qual: The FSF status qualifier for the access denied FSF status |
322 | */ | 322 | */ |
323 | void zfcp_cfdc_port_denied(struct zfcp_port *port, | 323 | void zfcp_cfdc_port_denied(struct zfcp_port *port, |
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c index dc5ac6e528c4..a391090a17c5 100644 --- a/drivers/scsi/a100u2w.c +++ b/drivers/scsi/a100u2w.c | |||
@@ -416,7 +416,7 @@ static u8 orc_load_firmware(struct orc_host * host) | |||
416 | /* Go back and check they match */ | 416 | /* Go back and check they match */ |
417 | 417 | ||
418 | outb(PRGMRST | DOWNLOAD, host->base + ORC_RISCCTL); /* Reset program count 0 */ | 418 | outb(PRGMRST | DOWNLOAD, host->base + ORC_RISCCTL); /* Reset program count 0 */ |
419 | bios_addr -= 0x1000; /* Reset the BIOS adddress */ | 419 | bios_addr -= 0x1000; /* Reset the BIOS address */ |
420 | for (i = 0, data32_ptr = (u8 *) & data32; /* Check the code */ | 420 | for (i = 0, data32_ptr = (u8 *) & data32; /* Check the code */ |
421 | i < 0x1000; /* Firmware code size = 4K */ | 421 | i < 0x1000; /* Firmware code size = 4K */ |
422 | i++, bios_addr++) { | 422 | i++, bios_addr++) { |
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index afc9aeba5edb..060ac4bd5a14 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c | |||
@@ -91,7 +91,7 @@ void aac_fib_map_free(struct aac_dev *dev) | |||
91 | * aac_fib_setup - setup the fibs | 91 | * aac_fib_setup - setup the fibs |
92 | * @dev: Adapter to set up | 92 | * @dev: Adapter to set up |
93 | * | 93 | * |
94 | * Allocate the PCI space for the fibs, map it and then intialise the | 94 | * Allocate the PCI space for the fibs, map it and then initialise the |
95 | * fib area, the unmapped fib data and also the free list | 95 | * fib area, the unmapped fib data and also the free list |
96 | */ | 96 | */ |
97 | 97 | ||
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.seq b/drivers/scsi/aic7xxx_old/aic7xxx.seq index 5997e7c3a191..1565be9ebd49 100644 --- a/drivers/scsi/aic7xxx_old/aic7xxx.seq +++ b/drivers/scsi/aic7xxx_old/aic7xxx.seq | |||
@@ -1178,7 +1178,7 @@ notFound: | |||
1178 | /* | 1178 | /* |
1179 | * Retrieve an SCB by SCBID first searching the disconnected list falling | 1179 | * Retrieve an SCB by SCBID first searching the disconnected list falling |
1180 | * back to DMA'ing the SCB down from the host. This routine assumes that | 1180 | * back to DMA'ing the SCB down from the host. This routine assumes that |
1181 | * ARG_1 is the SCBID of interrest and that SINDEX is the position in the | 1181 | * ARG_1 is the SCBID of interest and that SINDEX is the position in the |
1182 | * disconnected list to start the search from. If SINDEX is SCB_LIST_NULL, | 1182 | * disconnected list to start the search from. If SINDEX is SCB_LIST_NULL, |
1183 | * we go directly to the host for the SCB. | 1183 | * we go directly to the host for the SCB. |
1184 | */ | 1184 | */ |
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h index 28aaf349c111..40273a747d29 100644 --- a/drivers/scsi/aic94xx/aic94xx_reg_def.h +++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h | |||
@@ -1689,7 +1689,7 @@ | |||
1689 | #define PHY_START_CAL 0x01 | 1689 | #define PHY_START_CAL 0x01 |
1690 | 1690 | ||
1691 | /* | 1691 | /* |
1692 | * HST_PCIX2 Registers, Addresss Range: (0x00-0xFC) | 1692 | * HST_PCIX2 Registers, Address Range: (0x00-0xFC) |
1693 | */ | 1693 | */ |
1694 | #define PCIX_REG_BASE_ADR 0xB8040000 | 1694 | #define PCIX_REG_BASE_ADR 0xB8040000 |
1695 | 1695 | ||
@@ -1802,7 +1802,7 @@ | |||
1802 | #define PCIC_TP_CTRL 0xFC | 1802 | #define PCIC_TP_CTRL 0xFC |
1803 | 1803 | ||
1804 | /* | 1804 | /* |
1805 | * EXSI Registers, Addresss Range: (0x00-0xFC) | 1805 | * EXSI Registers, Address Range: (0x00-0xFC) |
1806 | */ | 1806 | */ |
1807 | #define EXSI_REG_BASE_ADR REG_BASE_ADDR_EXSI | 1807 | #define EXSI_REG_BASE_ADR REG_BASE_ADDR_EXSI |
1808 | 1808 | ||
diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c index c43698b1cb64..29593275201a 100644 --- a/drivers/scsi/aic94xx/aic94xx_scb.c +++ b/drivers/scsi/aic94xx/aic94xx_scb.c | |||
@@ -867,7 +867,7 @@ void asd_build_initiate_link_adm_task(struct asd_ascb *ascb, int phy_id, | |||
867 | * resources they have with this SCB, and then call this one at the | 867 | * resources they have with this SCB, and then call this one at the |
868 | * end of their timeout function. To do this, one should initialize | 868 | * end of their timeout function. To do this, one should initialize |
869 | * the ascb->timer.{function, data, expires} prior to calling the post | 869 | * the ascb->timer.{function, data, expires} prior to calling the post |
870 | * funcion. The timer is started by the post function. | 870 | * function. The timer is started by the post function. |
871 | */ | 871 | */ |
872 | void asd_ascb_timedout(unsigned long data) | 872 | void asd_ascb_timedout(unsigned long data) |
873 | { | 873 | { |
diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c b/drivers/scsi/aic94xx/aic94xx_seq.c index 74374618010c..390168f62a13 100644 --- a/drivers/scsi/aic94xx/aic94xx_seq.c +++ b/drivers/scsi/aic94xx/aic94xx_seq.c | |||
@@ -797,7 +797,7 @@ static void asd_init_lseq_mdp(struct asd_ha_struct *asd_ha, int lseq) | |||
797 | int j; | 797 | int j; |
798 | /* Start from Page 1 of Mode 0 and 1. */ | 798 | /* Start from Page 1 of Mode 0 and 1. */ |
799 | moffs = LSEQ_PAGE_SIZE + i*LSEQ_MODE_SCRATCH_SIZE; | 799 | moffs = LSEQ_PAGE_SIZE + i*LSEQ_MODE_SCRATCH_SIZE; |
800 | /* All the fields of page 1 can be intialized to 0. */ | 800 | /* All the fields of page 1 can be initialized to 0. */ |
801 | for (j = 0; j < LSEQ_PAGE_SIZE; j += 4) | 801 | for (j = 0; j < LSEQ_PAGE_SIZE; j += 4) |
802 | asd_write_reg_dword(asd_ha, LmSCRATCH(lseq)+moffs+j,0); | 802 | asd_write_reg_dword(asd_ha, LmSCRATCH(lseq)+moffs+j,0); |
803 | } | 803 | } |
@@ -938,7 +938,7 @@ static void asd_init_cseq_cio(struct asd_ha_struct *asd_ha) | |||
938 | asd_write_reg_dword(asd_ha, SCBPRO, 0); | 938 | asd_write_reg_dword(asd_ha, SCBPRO, 0); |
939 | asd_write_reg_dword(asd_ha, CSEQCON, 0); | 939 | asd_write_reg_dword(asd_ha, CSEQCON, 0); |
940 | 940 | ||
941 | /* Intialize CSEQ Mode 11 Interrupt Vectors. | 941 | /* Initialize CSEQ Mode 11 Interrupt Vectors. |
942 | * The addresses are 16 bit wide and in dword units. | 942 | * The addresses are 16 bit wide and in dword units. |
943 | * The values of their macros are in byte units. | 943 | * The values of their macros are in byte units. |
944 | * Thus we have to divide by 4. */ | 944 | * Thus we have to divide by 4. */ |
@@ -961,7 +961,7 @@ static void asd_init_cseq_cio(struct asd_ha_struct *asd_ha) | |||
961 | asd_write_reg_word(asd_ha, CPRGMCNT, cseq_idle_loop); | 961 | asd_write_reg_word(asd_ha, CPRGMCNT, cseq_idle_loop); |
962 | 962 | ||
963 | for (i = 0; i < 8; i++) { | 963 | for (i = 0; i < 8; i++) { |
964 | /* Intialize Mode n Link m Interrupt Enable. */ | 964 | /* Initialize Mode n Link m Interrupt Enable. */ |
965 | asd_write_reg_dword(asd_ha, CMnINTEN(i), EN_CMnRSPMBXF); | 965 | asd_write_reg_dword(asd_ha, CMnINTEN(i), EN_CMnRSPMBXF); |
966 | /* Initialize Mode n Request Mailbox. */ | 966 | /* Initialize Mode n Request Mailbox. */ |
967 | asd_write_reg_dword(asd_ha, CMnREQMBX(i), 0); | 967 | asd_write_reg_dword(asd_ha, CMnREQMBX(i), 0); |
diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c index 9c410b21db6d..c0353cdca929 100644 --- a/drivers/scsi/bfa/bfa_fcpim.c +++ b/drivers/scsi/bfa/bfa_fcpim.c | |||
@@ -1838,7 +1838,7 @@ bfa_ioim_sm_cleanup_qfull(struct bfa_ioim_s *ioim, enum bfa_ioim_event event) | |||
1838 | 1838 | ||
1839 | case BFA_IOIM_SM_ABORT: | 1839 | case BFA_IOIM_SM_ABORT: |
1840 | /* | 1840 | /* |
1841 | * IO is alraedy being cleaned up implicitly | 1841 | * IO is already being cleaned up implicitly |
1842 | */ | 1842 | */ |
1843 | ioim->io_cbfn = __bfa_cb_ioim_abort; | 1843 | ioim->io_cbfn = __bfa_cb_ioim_abort; |
1844 | break; | 1844 | break; |
diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c index 4e2eb92ba028..43fa986bb586 100644 --- a/drivers/scsi/bfa/bfa_fcs_lport.c +++ b/drivers/scsi/bfa/bfa_fcs_lport.c | |||
@@ -5646,7 +5646,7 @@ bfa_cb_lps_fdisc_comp(void *bfad, void *uarg, bfa_status_t status) | |||
5646 | switch (status) { | 5646 | switch (status) { |
5647 | case BFA_STATUS_OK: | 5647 | case BFA_STATUS_OK: |
5648 | /* | 5648 | /* |
5649 | * Initialiaze the V-Port fields | 5649 | * Initialize the V-Port fields |
5650 | */ | 5650 | */ |
5651 | __vport_fcid(vport) = vport->lps->lp_pid; | 5651 | __vport_fcid(vport) = vport->lps->lp_pid; |
5652 | vport->vport_stats.fdisc_accepts++; | 5652 | vport->vport_stats.fdisc_accepts++; |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index 8f1b5c8bf903..b0f8523e665f 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -3796,7 +3796,7 @@ static struct DeviceCtlBlk *device_alloc(struct AdapterCtlBlk *acb, | |||
3796 | * adapter_add_device - Adds the device instance to the adaptor instance. | 3796 | * adapter_add_device - Adds the device instance to the adaptor instance. |
3797 | * | 3797 | * |
3798 | * @acb: The adapter device to be updated | 3798 | * @acb: The adapter device to be updated |
3799 | * @dcb: A newly created and intialised device instance to add. | 3799 | * @dcb: A newly created and initialised device instance to add. |
3800 | **/ | 3800 | **/ |
3801 | static void adapter_add_device(struct AdapterCtlBlk *acb, | 3801 | static void adapter_add_device(struct AdapterCtlBlk *acb, |
3802 | struct DeviceCtlBlk *dcb) | 3802 | struct DeviceCtlBlk *dcb) |
@@ -4498,7 +4498,7 @@ static void __devinit adapter_init_chip(struct AdapterCtlBlk *acb) | |||
4498 | * init_adapter - Grab the resource for the card, setup the adapter | 4498 | * init_adapter - Grab the resource for the card, setup the adapter |
4499 | * information, set the card into a known state, create the various | 4499 | * information, set the card into a known state, create the various |
4500 | * tables etc etc. This basically gets all adapter information all up | 4500 | * tables etc etc. This basically gets all adapter information all up |
4501 | * to date, intialised and gets the chip in sync with it. | 4501 | * to date, initialised and gets the chip in sync with it. |
4502 | * | 4502 | * |
4503 | * @host: This hosts adapter structure | 4503 | * @host: This hosts adapter structure |
4504 | * @io_port: The base I/O port | 4504 | * @io_port: The base I/O port |
@@ -4789,7 +4789,7 @@ static void banner_display(void) | |||
4789 | * that it finds in the system. The pci_dev strcuture indicates which | 4789 | * that it finds in the system. The pci_dev strcuture indicates which |
4790 | * instance we are being called from. | 4790 | * instance we are being called from. |
4791 | * | 4791 | * |
4792 | * @dev: The PCI device to intialize. | 4792 | * @dev: The PCI device to initialize. |
4793 | * @id: Looks like a pointer to the entry in our pci device table | 4793 | * @id: Looks like a pointer to the entry in our pci device table |
4794 | * that was actually matched by the PCI subsystem. | 4794 | * that was actually matched by the PCI subsystem. |
4795 | * | 4795 | * |
@@ -4860,7 +4860,7 @@ fail: | |||
4860 | * dc395x_remove_one - Called to remove a single instance of the | 4860 | * dc395x_remove_one - Called to remove a single instance of the |
4861 | * adapter. | 4861 | * adapter. |
4862 | * | 4862 | * |
4863 | * @dev: The PCI device to intialize. | 4863 | * @dev: The PCI device to initialize. |
4864 | **/ | 4864 | **/ |
4865 | static void __devexit dc395x_remove_one(struct pci_dev *dev) | 4865 | static void __devexit dc395x_remove_one(struct pci_dev *dev) |
4866 | { | 4866 | { |
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index cdc06cda76e5..5962d1a5a674 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c | |||
@@ -1250,7 +1250,7 @@ static void fc_lun_reset_send(unsigned long data) | |||
1250 | /** | 1250 | /** |
1251 | * fc_lun_reset() - Send a LUN RESET command to a device | 1251 | * fc_lun_reset() - Send a LUN RESET command to a device |
1252 | * and wait for the reply | 1252 | * and wait for the reply |
1253 | * @lport: The local port to sent the comand on | 1253 | * @lport: The local port to sent the command on |
1254 | * @fsp: The FCP packet that identifies the LUN to be reset | 1254 | * @fsp: The FCP packet that identifies the LUN to be reset |
1255 | * @id: The SCSI command ID | 1255 | * @id: The SCSI command ID |
1256 | * @lun: The LUN ID to be reset | 1256 | * @lun: The LUN ID to be reset |
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index c06491b5862f..3512abb8a587 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -1335,7 +1335,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ | |||
1335 | } | 1335 | } |
1336 | 1336 | ||
1337 | /** | 1337 | /** |
1338 | * lpfc_param_init - Intializes a cfg attribute | 1338 | * lpfc_param_init - Initializes a cfg attribute |
1339 | * | 1339 | * |
1340 | * Description: | 1340 | * Description: |
1341 | * Macro that given an attr e.g. hba_queue_depth expands | 1341 | * Macro that given an attr e.g. hba_queue_depth expands |
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index f9f160ab2ee9..bb015960dbc9 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c | |||
@@ -2852,7 +2852,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la) | |||
2852 | if (unlikely(!fcf_record)) { | 2852 | if (unlikely(!fcf_record)) { |
2853 | lpfc_printf_log(phba, KERN_ERR, | 2853 | lpfc_printf_log(phba, KERN_ERR, |
2854 | LOG_MBOX | LOG_SLI, | 2854 | LOG_MBOX | LOG_SLI, |
2855 | "2554 Could not allocate memmory for " | 2855 | "2554 Could not allocate memory for " |
2856 | "fcf record\n"); | 2856 | "fcf record\n"); |
2857 | rc = -ENODEV; | 2857 | rc = -ENODEV; |
2858 | goto out; | 2858 | goto out; |
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 462242dcdd0a..6d0b36aa3389 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
@@ -8071,7 +8071,7 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev) | |||
8071 | * the HBA. | 8071 | * the HBA. |
8072 | */ | 8072 | */ |
8073 | 8073 | ||
8074 | /* HBA interrupt will be diabled after this call */ | 8074 | /* HBA interrupt will be disabled after this call */ |
8075 | lpfc_sli_hba_down(phba); | 8075 | lpfc_sli_hba_down(phba); |
8076 | /* Stop kthread signal shall trigger work_done one more time */ | 8076 | /* Stop kthread signal shall trigger work_done one more time */ |
8077 | kthread_stop(phba->worker_thread); | 8077 | kthread_stop(phba->worker_thread); |
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 634b2fea9c4d..a359d2b873ce 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -10172,7 +10172,7 @@ lpfc_sli4_intr_handler(int irq, void *dev_id) | |||
10172 | * lpfc_sli4_queue_free - free a queue structure and associated memory | 10172 | * lpfc_sli4_queue_free - free a queue structure and associated memory |
10173 | * @queue: The queue structure to free. | 10173 | * @queue: The queue structure to free. |
10174 | * | 10174 | * |
10175 | * This function frees a queue structure and the DMAable memeory used for | 10175 | * This function frees a queue structure and the DMAable memory used for |
10176 | * the host resident queue. This function must be called after destroying the | 10176 | * the host resident queue. This function must be called after destroying the |
10177 | * queue on the HBA. | 10177 | * queue on the HBA. |
10178 | **/ | 10178 | **/ |
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index f5644745e24e..853411911b2e 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* | 15 | /* |
16 | * Comand coalescing - This feature allows the driver to be able to combine | 16 | * Command coalescing - This feature allows the driver to be able to combine |
17 | * two or more commands and issue as one command in order to boost I/O | 17 | * two or more commands and issue as one command in order to boost I/O |
18 | * performance. Useful if the nature of the I/O is sequential. It is not very | 18 | * performance. Useful if the nature of the I/O is sequential. It is not very |
19 | * useful for random natured I/Os. | 19 | * useful for random natured I/Os. |
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c index a7008c0c24f9..25506c777381 100644 --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c | |||
@@ -224,7 +224,7 @@ mraid_mm_unlocked_ioctl(struct file *filep, unsigned int cmd, | |||
224 | { | 224 | { |
225 | int err; | 225 | int err; |
226 | 226 | ||
227 | /* inconsistant: mraid_mm_compat_ioctl doesn't take the BKL */ | 227 | /* inconsistent: mraid_mm_compat_ioctl doesn't take the BKL */ |
228 | mutex_lock(&mraid_mm_mutex); | 228 | mutex_lock(&mraid_mm_mutex); |
229 | err = mraid_mm_ioctl(filep, cmd, arg); | 229 | err = mraid_mm_ioctl(filep, cmd, arg); |
230 | mutex_unlock(&mraid_mm_mutex); | 230 | mutex_unlock(&mraid_mm_mutex); |
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index f8c86b28f03f..b95285f3383f 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c | |||
@@ -603,7 +603,7 @@ static u32 pm8001_request_irq(struct pm8001_hba_info *pm8001_ha) | |||
603 | #endif | 603 | #endif |
604 | 604 | ||
605 | intx: | 605 | intx: |
606 | /* intialize the INT-X interrupt */ | 606 | /* initialize the INT-X interrupt */ |
607 | rc = request_irq(pdev->irq, irq_handler, IRQF_SHARED, DRV_NAME, | 607 | rc = request_irq(pdev->irq, irq_handler, IRQF_SHARED, DRV_NAME, |
608 | SHOST_TO_SAS_HA(pm8001_ha->shost)); | 608 | SHOST_TO_SAS_HA(pm8001_ha->shost)); |
609 | return rc; | 609 | return rc; |
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c index d53e6503c6d5..a2ed201885ae 100644 --- a/drivers/scsi/scsi_netlink.c +++ b/drivers/scsi/scsi_netlink.c | |||
@@ -477,7 +477,7 @@ EXPORT_SYMBOL_GPL(scsi_nl_remove_driver); | |||
477 | 477 | ||
478 | 478 | ||
479 | /** | 479 | /** |
480 | * scsi_netlink_init - Called by SCSI subsystem to intialize | 480 | * scsi_netlink_init - Called by SCSI subsystem to initialize |
481 | * the SCSI transport netlink interface | 481 | * the SCSI transport netlink interface |
482 | * | 482 | * |
483 | **/ | 483 | **/ |
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 4c68d36f9ac2..490ce213204e 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c | |||
@@ -864,13 +864,15 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) | |||
864 | 864 | ||
865 | error = device_add(&sdev->sdev_gendev); | 865 | error = device_add(&sdev->sdev_gendev); |
866 | if (error) { | 866 | if (error) { |
867 | printk(KERN_INFO "error 1\n"); | 867 | sdev_printk(KERN_INFO, sdev, |
868 | "failed to add device: %d\n", error); | ||
868 | return error; | 869 | return error; |
869 | } | 870 | } |
870 | device_enable_async_suspend(&sdev->sdev_dev); | 871 | device_enable_async_suspend(&sdev->sdev_dev); |
871 | error = device_add(&sdev->sdev_dev); | 872 | error = device_add(&sdev->sdev_dev); |
872 | if (error) { | 873 | if (error) { |
873 | printk(KERN_INFO "error 2\n"); | 874 | sdev_printk(KERN_INFO, sdev, |
875 | "failed to add class device: %d\n", error); | ||
874 | device_del(&sdev->sdev_gendev); | 876 | device_del(&sdev->sdev_gendev); |
875 | return error; | 877 | return error; |
876 | } | 878 | } |
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 6b97ded9d45d..b4543f575f46 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c | |||
@@ -1866,7 +1866,7 @@ static pci_ers_result_t sym2_io_slot_dump(struct pci_dev *pdev) | |||
1866 | * | 1866 | * |
1867 | * This routine is similar to sym_set_workarounds(), except | 1867 | * This routine is similar to sym_set_workarounds(), except |
1868 | * that, at this point, we already know that the device was | 1868 | * that, at this point, we already know that the device was |
1869 | * successfully intialized at least once before, and so most | 1869 | * successfully initialized at least once before, and so most |
1870 | * of the steps taken there are un-needed here. | 1870 | * of the steps taken there are un-needed here. |
1871 | */ | 1871 | */ |
1872 | static void sym2_reset_workarounds(struct pci_dev *pdev) | 1872 | static void sym2_reset_workarounds(struct pci_dev *pdev) |
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index a067046c9da2..1a478bf88c9d 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c | |||
@@ -341,9 +341,9 @@ static void atmel_spi_next_message(struct spi_master *master) | |||
341 | /* | 341 | /* |
342 | * For DMA, tx_buf/tx_dma have the same relationship as rx_buf/rx_dma: | 342 | * For DMA, tx_buf/tx_dma have the same relationship as rx_buf/rx_dma: |
343 | * - The buffer is either valid for CPU access, else NULL | 343 | * - The buffer is either valid for CPU access, else NULL |
344 | * - If the buffer is valid, so is its DMA addresss | 344 | * - If the buffer is valid, so is its DMA address |
345 | * | 345 | * |
346 | * This driver manages the dma addresss unless message->is_dma_mapped. | 346 | * This driver manages the dma address unless message->is_dma_mapped. |
347 | */ | 347 | */ |
348 | static int | 348 | static int |
349 | atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer) | 349 | atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer) |
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 4e6245e67995..603428213d21 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | 39 | ||
40 | /* | 40 | /* |
41 | * This supports acccess to SPI devices using normal userspace I/O calls. | 41 | * This supports access to SPI devices using normal userspace I/O calls. |
42 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, | 42 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, |
43 | * and often mask message boundaries, full SPI support requires full duplex | 43 | * and often mask message boundaries, full SPI support requires full duplex |
44 | * transfers. There are several kinds of internal message boundaries to | 44 | * transfers. There are several kinds of internal message boundaries to |
diff --git a/drivers/staging/msm/msm_fb_bl.c b/drivers/staging/msm/msm_fb_bl.c index 033fc9486e01..2a8077511fc0 100644 --- a/drivers/staging/msm/msm_fb_bl.c +++ b/drivers/staging/msm/msm_fb_bl.c | |||
@@ -42,7 +42,7 @@ static int msm_fb_bl_update_status(struct backlight_device *pbd) | |||
42 | return 0; | 42 | return 0; |
43 | } | 43 | } |
44 | 44 | ||
45 | static struct backlight_ops msm_fb_bl_ops = { | 45 | static const struct backlight_ops msm_fb_bl_ops = { |
46 | .get_brightness = msm_fb_bl_get_brightness, | 46 | .get_brightness = msm_fb_bl_get_brightness, |
47 | .update_status = msm_fb_bl_update_status, | 47 | .update_status = msm_fb_bl_update_status, |
48 | }; | 48 | }; |
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index da040c12fbf9..9f26dc9408bb 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/drivers/staging/olpc_dcon/olpc_dcon.c | |||
@@ -614,7 +614,7 @@ static struct device_attribute dcon_device_files[] = { | |||
614 | __ATTR(resumeline, 0644, dcon_resumeline_show, dcon_resumeline_store), | 614 | __ATTR(resumeline, 0644, dcon_resumeline_show, dcon_resumeline_store), |
615 | }; | 615 | }; |
616 | 616 | ||
617 | static struct backlight_ops dcon_bl_ops = { | 617 | static const struct backlight_ops dcon_bl_ops = { |
618 | .get_brightness = dconbl_get, | 618 | .get_brightness = dconbl_get, |
619 | .update_status = dconbl_set | 619 | .update_status = dconbl_set |
620 | }; | 620 | }; |
diff --git a/drivers/staging/samsung-laptop/samsung-laptop.c b/drivers/staging/samsung-laptop/samsung-laptop.c index ac2bf11e1119..701e8d52a9fa 100644 --- a/drivers/staging/samsung-laptop/samsung-laptop.c +++ b/drivers/staging/samsung-laptop/samsung-laptop.c | |||
@@ -269,7 +269,7 @@ static int update_status(struct backlight_device *bd) | |||
269 | return 0; | 269 | return 0; |
270 | } | 270 | } |
271 | 271 | ||
272 | static struct backlight_ops backlight_ops = { | 272 | static const struct backlight_ops backlight_ops = { |
273 | .get_brightness = get_brightness, | 273 | .get_brightness = get_brightness, |
274 | .update_status = update_status, | 274 | .update_status = update_status, |
275 | }; | 275 | }; |
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index c4bc8d5a9d18..b00101972f20 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
@@ -6580,7 +6580,8 @@ static long do_ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long ar | |||
6580 | case IXJCTL_SET_FILTER: | 6580 | case IXJCTL_SET_FILTER: |
6581 | if (copy_from_user(&jf, argp, sizeof(jf))) | 6581 | if (copy_from_user(&jf, argp, sizeof(jf))) |
6582 | retval = -EFAULT; | 6582 | retval = -EFAULT; |
6583 | retval = ixj_init_filter(j, &jf); | 6583 | else |
6584 | retval = ixj_init_filter(j, &jf); | ||
6584 | break; | 6585 | break; |
6585 | case IXJCTL_SET_FILTER_RAW: | 6586 | case IXJCTL_SET_FILTER_RAW: |
6586 | if (copy_from_user(&jfr, argp, sizeof(jfr))) | 6587 | if (copy_from_user(&jfr, argp, sizeof(jfr))) |
diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c index 1210534822d6..5408186afc35 100644 --- a/drivers/usb/gadget/imx_udc.c +++ b/drivers/usb/gadget/imx_udc.c | |||
@@ -1320,7 +1320,7 @@ static struct imx_udc_struct controller = { | |||
1320 | }; | 1320 | }; |
1321 | 1321 | ||
1322 | /******************************************************************************* | 1322 | /******************************************************************************* |
1323 | * USB gadged driver functions | 1323 | * USB gadget driver functions |
1324 | ******************************************************************************* | 1324 | ******************************************************************************* |
1325 | */ | 1325 | */ |
1326 | int usb_gadget_probe_driver(struct usb_gadget_driver *driver, | 1326 | int usb_gadget_probe_driver(struct usb_gadget_driver *driver, |
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c index 777972454e3e..1eca8b47ce3c 100644 --- a/drivers/usb/gadget/langwell_udc.c +++ b/drivers/usb/gadget/langwell_udc.c | |||
@@ -3086,7 +3086,7 @@ static void langwell_udc_remove(struct pci_dev *pdev) | |||
3086 | 3086 | ||
3087 | kfree(dev->ep); | 3087 | kfree(dev->ep); |
3088 | 3088 | ||
3089 | /* diable IRQ handler */ | 3089 | /* disable IRQ handler */ |
3090 | if (dev->got_irq) | 3090 | if (dev->got_irq) |
3091 | free_irq(pdev->irq, dev); | 3091 | free_irq(pdev->irq, dev); |
3092 | 3092 | ||
@@ -3406,7 +3406,7 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state) | |||
3406 | /* disable interrupt and set controller to stop state */ | 3406 | /* disable interrupt and set controller to stop state */ |
3407 | langwell_udc_stop(dev); | 3407 | langwell_udc_stop(dev); |
3408 | 3408 | ||
3409 | /* diable IRQ handler */ | 3409 | /* disable IRQ handler */ |
3410 | if (dev->got_irq) | 3410 | if (dev->got_irq) |
3411 | free_irq(pdev->irq, dev); | 3411 | free_irq(pdev->irq, dev); |
3412 | dev->got_irq = 0; | 3412 | dev->got_irq = 0; |
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 20092a27a1e8..12fd184226f2 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c | |||
@@ -98,13 +98,13 @@ void fhci_usb_enable_interrupt(struct fhci_usb *usb) | |||
98 | usb->intr_nesting_cnt--; | 98 | usb->intr_nesting_cnt--; |
99 | } | 99 | } |
100 | 100 | ||
101 | /* diable the usb interrupt */ | 101 | /* disable the usb interrupt */ |
102 | void fhci_usb_disable_interrupt(struct fhci_usb *usb) | 102 | void fhci_usb_disable_interrupt(struct fhci_usb *usb) |
103 | { | 103 | { |
104 | struct fhci_hcd *fhci = usb->fhci; | 104 | struct fhci_hcd *fhci = usb->fhci; |
105 | 105 | ||
106 | if (usb->intr_nesting_cnt == 0) { | 106 | if (usb->intr_nesting_cnt == 0) { |
107 | /* diable the timer interrupt */ | 107 | /* disable the timer interrupt */ |
108 | disable_irq_nosync(fhci->timer->irq); | 108 | disable_irq_nosync(fhci->timer->irq); |
109 | 109 | ||
110 | /* disable the usb interrupt */ | 110 | /* disable the usb interrupt */ |
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c index 7be548ca2183..38fe058fbe61 100644 --- a/drivers/usb/host/fhci-tds.c +++ b/drivers/usb/host/fhci-tds.c | |||
@@ -271,8 +271,8 @@ void fhci_init_ep_registers(struct fhci_usb *usb, struct endpoint *ep, | |||
271 | 271 | ||
272 | /* | 272 | /* |
273 | * Collect the submitted frames and inform the application about them | 273 | * Collect the submitted frames and inform the application about them |
274 | * It is also prepearing the TDs for new frames. If the Tx interrupts | 274 | * It is also preparing the TDs for new frames. If the Tx interrupts |
275 | * are diabled, the application should call that routine to get | 275 | * are disabled, the application should call that routine to get |
276 | * confirmation about the submitted frames. Otherwise, the routine is | 276 | * confirmation about the submitted frames. Otherwise, the routine is |
277 | * called frome the interrupt service routine during the Tx interrupt. | 277 | * called frome the interrupt service routine during the Tx interrupt. |
278 | * In that case the application is informed by calling the application | 278 | * In that case the application is informed by calling the application |
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c index e49b75a78000..f90d003f2302 100644 --- a/drivers/usb/host/imx21-hcd.c +++ b/drivers/usb/host/imx21-hcd.c | |||
@@ -1658,7 +1658,7 @@ static int imx21_hc_reset(struct usb_hcd *hcd) | |||
1658 | 1658 | ||
1659 | spin_lock_irqsave(&imx21->lock, flags); | 1659 | spin_lock_irqsave(&imx21->lock, flags); |
1660 | 1660 | ||
1661 | /* Reset the Host controler modules */ | 1661 | /* Reset the Host controller modules */ |
1662 | writel(USBOTG_RST_RSTCTRL | USBOTG_RST_RSTRH | | 1662 | writel(USBOTG_RST_RSTCTRL | USBOTG_RST_RSTRH | |
1663 | USBOTG_RST_RSTHSIE | USBOTG_RST_RSTHC, | 1663 | USBOTG_RST_RSTHSIE | USBOTG_RST_RSTHC, |
1664 | imx21->regs + USBOTG_RST_CTRL); | 1664 | imx21->regs + USBOTG_RST_CTRL); |
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index 32149be4ad8e..e0cb12b573f9 100644 --- a/drivers/usb/host/oxu210hp-hcd.c +++ b/drivers/usb/host/oxu210hp-hcd.c | |||
@@ -3094,7 +3094,7 @@ static int oxu_hub_status_data(struct usb_hcd *hcd, char *buf) | |||
3094 | 3094 | ||
3095 | /* Some boards (mostly VIA?) report bogus overcurrent indications, | 3095 | /* Some boards (mostly VIA?) report bogus overcurrent indications, |
3096 | * causing massive log spam unless we completely ignore them. It | 3096 | * causing massive log spam unless we completely ignore them. It |
3097 | * may be relevant that VIA VT8235 controlers, where PORT_POWER is | 3097 | * may be relevant that VIA VT8235 controllers, where PORT_POWER is |
3098 | * always set, seem to clear PORT_OCC and PORT_CSC when writing to | 3098 | * always set, seem to clear PORT_OCC and PORT_CSC when writing to |
3099 | * PORT_POWER; that's surprising, but maybe within-spec. | 3099 | * PORT_POWER; that's surprising, but maybe within-spec. |
3100 | */ | 3100 | */ |
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index 44f8b9225054..a6afd15f6a46 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c | |||
@@ -717,7 +717,7 @@ static int adu_probe(struct usb_interface *interface, | |||
717 | goto exit; | 717 | goto exit; |
718 | } | 718 | } |
719 | 719 | ||
720 | /* allocate memory for our device state and intialize it */ | 720 | /* allocate memory for our device state and initialize it */ |
721 | dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL); | 721 | dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL); |
722 | if (dev == NULL) { | 722 | if (dev == NULL) { |
723 | dev_err(&interface->dev, "Out of memory\n"); | 723 | dev_err(&interface->dev, "Out of memory\n"); |
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index c9078e4e1f4d..e573e4704015 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c | |||
@@ -769,7 +769,7 @@ static int iowarrior_probe(struct usb_interface *interface, | |||
769 | int i; | 769 | int i; |
770 | int retval = -ENOMEM; | 770 | int retval = -ENOMEM; |
771 | 771 | ||
772 | /* allocate memory for our device state and intialize it */ | 772 | /* allocate memory for our device state and initialize it */ |
773 | dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL); | 773 | dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL); |
774 | if (dev == NULL) { | 774 | if (dev == NULL) { |
775 | dev_err(&interface->dev, "Out of memory\n"); | 775 | dev_err(&interface->dev, "Out of memory\n"); |
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index edffef642337..eefb8275bb7e 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c | |||
@@ -642,7 +642,7 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * | |||
642 | int i; | 642 | int i; |
643 | int retval = -ENOMEM; | 643 | int retval = -ENOMEM; |
644 | 644 | ||
645 | /* allocate memory for our device state and intialize it */ | 645 | /* allocate memory for our device state and initialize it */ |
646 | 646 | ||
647 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 647 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
648 | if (dev == NULL) { | 648 | if (dev == NULL) { |
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 9b162dfaa4fb..ed58c6c8f15c 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c | |||
@@ -1684,7 +1684,7 @@ static inline void __init musb_g_init_endpoints(struct musb *musb) | |||
1684 | struct musb_hw_ep *hw_ep; | 1684 | struct musb_hw_ep *hw_ep; |
1685 | unsigned count = 0; | 1685 | unsigned count = 0; |
1686 | 1686 | ||
1687 | /* intialize endpoint list just once */ | 1687 | /* initialize endpoint list just once */ |
1688 | INIT_LIST_HEAD(&(musb->g.ep_list)); | 1688 | INIT_LIST_HEAD(&(musb->g.ep_list)); |
1689 | 1689 | ||
1690 | for (epnum = 0, hw_ep = musb->endpoints; | 1690 | for (epnum = 0, hw_ep = musb->endpoints; |
@@ -1765,7 +1765,7 @@ void musb_gadget_cleanup(struct musb *musb) | |||
1765 | * | 1765 | * |
1766 | * -EINVAL something went wrong (not driver) | 1766 | * -EINVAL something went wrong (not driver) |
1767 | * -EBUSY another gadget is already using the controller | 1767 | * -EBUSY another gadget is already using the controller |
1768 | * -ENOMEM no memeory to perform the operation | 1768 | * -ENOMEM no memory to perform the operation |
1769 | * | 1769 | * |
1770 | * @param driver the gadget driver | 1770 | * @param driver the gadget driver |
1771 | * @param bind the driver's bind function | 1771 | * @param bind the driver's bind function |
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c index c7b1d8108de9..8cb9d80207fa 100644 --- a/drivers/usb/wusbcore/wa-rpipe.c +++ b/drivers/usb/wusbcore/wa-rpipe.c | |||
@@ -49,7 +49,7 @@ | |||
49 | * | 49 | * |
50 | * USB Stack port number 4 (1 based) | 50 | * USB Stack port number 4 (1 based) |
51 | * WUSB code port index 3 (0 based) | 51 | * WUSB code port index 3 (0 based) |
52 | * USB Addresss 5 (2 based -- 0 is for default, 1 for root hub) | 52 | * USB Address 5 (2 based -- 0 is for default, 1 for root hub) |
53 | * | 53 | * |
54 | * Now, because we don't use the concept as default address exactly | 54 | * Now, because we don't use the concept as default address exactly |
55 | * like the (wired) USB code does, we need to kind of skip it. So we | 55 | * like the (wired) USB code does, we need to kind of skip it. So we |
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 8dce25126330..bac163450216 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
@@ -111,7 +111,7 @@ static int atmel_bl_get_brightness(struct backlight_device *bl) | |||
111 | return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); | 111 | return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); |
112 | } | 112 | } |
113 | 113 | ||
114 | static struct backlight_ops atmel_lcdc_bl_ops = { | 114 | static const struct backlight_ops atmel_lcdc_bl_ops = { |
115 | .update_status = atmel_bl_update_status, | 115 | .update_status = atmel_bl_update_status, |
116 | .get_brightness = atmel_bl_get_brightness, | 116 | .get_brightness = atmel_bl_get_brightness, |
117 | }; | 117 | }; |
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 34a0851bcbfa..dd9de2e80580 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c | |||
@@ -1786,7 +1786,7 @@ static int aty128_bl_get_brightness(struct backlight_device *bd) | |||
1786 | return bd->props.brightness; | 1786 | return bd->props.brightness; |
1787 | } | 1787 | } |
1788 | 1788 | ||
1789 | static struct backlight_ops aty128_bl_data = { | 1789 | static const struct backlight_ops aty128_bl_data = { |
1790 | .get_brightness = aty128_bl_get_brightness, | 1790 | .get_brightness = aty128_bl_get_brightness, |
1791 | .update_status = aty128_bl_update_status, | 1791 | .update_status = aty128_bl_update_status, |
1792 | }; | 1792 | }; |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 5a3ce3ad1ec8..767ab4fb1a05 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -2221,7 +2221,7 @@ static int aty_bl_get_brightness(struct backlight_device *bd) | |||
2221 | return bd->props.brightness; | 2221 | return bd->props.brightness; |
2222 | } | 2222 | } |
2223 | 2223 | ||
2224 | static struct backlight_ops aty_bl_data = { | 2224 | static const struct backlight_ops aty_bl_data = { |
2225 | .get_brightness = aty_bl_get_brightness, | 2225 | .get_brightness = aty_bl_get_brightness, |
2226 | .update_status = aty_bl_update_status, | 2226 | .update_status = aty_bl_update_status, |
2227 | }; | 2227 | }; |
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c index 256966e9667d..9b811ddbce83 100644 --- a/drivers/video/aty/radeon_backlight.c +++ b/drivers/video/aty/radeon_backlight.c | |||
@@ -128,7 +128,7 @@ static int radeon_bl_get_brightness(struct backlight_device *bd) | |||
128 | return bd->props.brightness; | 128 | return bd->props.brightness; |
129 | } | 129 | } |
130 | 130 | ||
131 | static struct backlight_ops radeon_bl_data = { | 131 | static const struct backlight_ops radeon_bl_data = { |
132 | .get_brightness = radeon_bl_get_brightness, | 132 | .get_brightness = radeon_bl_get_brightness, |
133 | .update_status = radeon_bl_update_status, | 133 | .update_status = radeon_bl_update_status, |
134 | }; | 134 | }; |
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c index 38ffc3fbcbe4..c789c46e38af 100644 --- a/drivers/video/backlight/88pm860x_bl.c +++ b/drivers/video/backlight/88pm860x_bl.c | |||
@@ -155,7 +155,7 @@ out: | |||
155 | return -EINVAL; | 155 | return -EINVAL; |
156 | } | 156 | } |
157 | 157 | ||
158 | static struct backlight_ops pm860x_backlight_ops = { | 158 | static const struct backlight_ops pm860x_backlight_ops = { |
159 | .options = BL_CORE_SUSPENDRESUME, | 159 | .options = BL_CORE_SUSPENDRESUME, |
160 | .update_status = pm860x_backlight_update_status, | 160 | .update_status = pm860x_backlight_update_status, |
161 | .get_brightness = pm860x_backlight_get_brightness, | 161 | .get_brightness = pm860x_backlight_get_brightness, |
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c index b2b2c7ba1f63..209acc105cbc 100644 --- a/drivers/video/backlight/max8925_bl.c +++ b/drivers/video/backlight/max8925_bl.c | |||
@@ -92,7 +92,7 @@ static int max8925_backlight_get_brightness(struct backlight_device *bl) | |||
92 | return ret; | 92 | return ret; |
93 | } | 93 | } |
94 | 94 | ||
95 | static struct backlight_ops max8925_backlight_ops = { | 95 | static const struct backlight_ops max8925_backlight_ops = { |
96 | .options = BL_CORE_SUSPENDRESUME, | 96 | .options = BL_CORE_SUSPENDRESUME, |
97 | .update_status = max8925_backlight_update_status, | 97 | .update_status = max8925_backlight_update_status, |
98 | .get_brightness = max8925_backlight_get_brightness, | 98 | .get_brightness = max8925_backlight_get_brightness, |
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c index 2fb552a6f32c..6aac6d1b937b 100644 --- a/drivers/video/nvidia/nv_backlight.c +++ b/drivers/video/nvidia/nv_backlight.c | |||
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(struct backlight_device *bd) | |||
87 | return bd->props.brightness; | 87 | return bd->props.brightness; |
88 | } | 88 | } |
89 | 89 | ||
90 | static struct backlight_ops nvidia_bl_ops = { | 90 | static const struct backlight_ops nvidia_bl_ops = { |
91 | .get_brightness = nvidia_bl_get_brightness, | 91 | .get_brightness = nvidia_bl_get_brightness, |
92 | .update_status = nvidia_bl_update_status, | 92 | .update_status = nvidia_bl_update_status, |
93 | }; | 93 | }; |
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index e1c765d11419..61026f96ad20 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c | |||
@@ -465,7 +465,7 @@ static int taal_bl_get_intensity(struct backlight_device *dev) | |||
465 | return 0; | 465 | return 0; |
466 | } | 466 | } |
467 | 467 | ||
468 | static struct backlight_ops taal_bl_ops = { | 468 | static const struct backlight_ops taal_bl_ops = { |
469 | .get_brightness = taal_bl_get_intensity, | 469 | .get_brightness = taal_bl_get_intensity, |
470 | .update_status = taal_bl_update_status, | 470 | .update_status = taal_bl_update_status, |
471 | }; | 471 | }; |
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 618f36bec10d..da388186d617 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct backlight_device *bd) | |||
331 | return bd->props.brightness; | 331 | return bd->props.brightness; |
332 | } | 332 | } |
333 | 333 | ||
334 | static struct backlight_ops riva_bl_ops = { | 334 | static const struct backlight_ops riva_bl_ops = { |
335 | .get_brightness = riva_bl_get_brightness, | 335 | .get_brightness = riva_bl_get_brightness, |
336 | .update_status = riva_bl_update_status, | 336 | .update_status = riva_bl_update_status, |
337 | }; | 337 | }; |
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index dee64c3b1e67..2ab704118c44 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c | |||
@@ -536,7 +536,7 @@ static int sstfb_set_par(struct fb_info *info) | |||
536 | fbiinit2 = sst_read(FBIINIT2); | 536 | fbiinit2 = sst_read(FBIINIT2); |
537 | fbiinit3 = sst_read(FBIINIT3); | 537 | fbiinit3 = sst_read(FBIINIT3); |
538 | 538 | ||
539 | /* everything is reset. we enable fbiinit2/3 remap : dac acces ok */ | 539 | /* everything is reset. we enable fbiinit2/3 remap : dac access ok */ |
540 | pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, | 540 | pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, |
541 | PCI_EN_INIT_WR | PCI_REMAP_DAC ); | 541 | PCI_EN_INIT_WR | PCI_REMAP_DAC ); |
542 | 542 | ||