aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 12:20:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 12:20:59 -0400
commitf39d01be4c59a61a08d0cb53f615e7016b85d339 (patch)
tree6777590e3ff2ddf4df1d38444ba7d692cd463b7b /drivers
parent54291263519ac2c9bdda68b23b02fef3808deed4 (diff)
parent7db82437cfcac4bdfe79a6323eb554fdfa271623 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits) vlynq: make whole Kconfig-menu dependant on architecture add descriptive comment for TIF_MEMDIE task flag declaration. EEPROM: max6875: Header file cleanup EEPROM: 93cx6: Header file cleanup EEPROM: Header file cleanup agp: use NULL instead of 0 when pointer is needed rtc-v3020: make bitfield unsigned PCI: make bitfield unsigned jbd2: use NULL instead of 0 when pointer is needed cciss: fix shadows sparse warning doc: inode uses a mutex instead of a semaphore. uml: i386: Avoid redefinition of NR_syscalls fix "seperate" typos in comments cocbalt_lcdfb: correct sections doc: Change urls for sparse Powerpc: wii: Fix typo in comment i2o: cleanup some exit paths Documentation/: it's -> its where appropriate UML: Fix compiler warning due to missing task_struct declaration UML: add kernel.h include to signal.c ...
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/osl.c4
-rw-r--r--drivers/acpi/power.c1
-rw-r--r--drivers/ata/ata_piix.c2
-rw-r--r--drivers/block/cciss.c3
-rw-r--r--drivers/char/agp/generic.c2
-rw-r--r--drivers/char/bsr.c2
-rw-r--r--drivers/firewire/ohci.c2
-rw-r--r--drivers/gpu/drm/drm_bufs.c2
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
-rw-r--r--drivers/gpu/drm/radeon/atombios.h4
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba6110.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba6120.c4
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba7220.c2
-rw-r--r--drivers/isdn/hardware/mISDN/hfcmulti.c2
-rw-r--r--drivers/isdn/hisax/hfc4s8s_l1.c2
-rw-r--r--drivers/macintosh/windfarm_pm81.c2
-rw-r--r--drivers/media/dvb/dvb-usb/friio-fe.c2
-rw-r--r--drivers/message/i2o/i2o_config.c16
-rw-r--r--drivers/misc/eeprom/eeprom.c36
-rw-r--r--drivers/misc/eeprom/eeprom_93cx6.c39
-rw-r--r--drivers/misc/eeprom/max6875.c52
-rw-r--r--drivers/net/bnx2x_hsi.h2
-rw-r--r--drivers/net/ps3_gelic_wireless.c2
-rw-r--r--drivers/net/smsc911x.c4
-rw-r--r--drivers/pci/hotplug/cpqphp_core.c2
-rw-r--r--drivers/pci/pci.c2
-rw-r--r--drivers/pci/pci.h2
-rw-r--r--drivers/ps3/ps3-sys-manager.c2
-rw-r--r--drivers/regulator/core.c2
-rw-r--r--drivers/rtc/rtc-rx8581.c6
-rw-r--r--drivers/rtc/rtc-stk17ta8.c4
-rw-r--r--drivers/s390/char/sclp_cpi_sys.c2
-rw-r--r--drivers/scsi/bfa/include/defs/bfa_defs_cee.h2
-rw-r--r--drivers/scsi/bfa/include/defs/bfa_defs_status.h4
-rw-r--r--drivers/spi/spi_mpc8xxx.c2
-rw-r--r--drivers/staging/vt6655/rxtx.c14
-rw-r--r--drivers/staging/vt6656/rxtx.c6
-rw-r--r--drivers/usb/host/ehci-omap.c2
-rw-r--r--drivers/usb/wusbcore/wa-xfer.c2
-rw-r--r--drivers/video/cobalt_lcdfb.c2
-rw-r--r--drivers/virtio/virtio_pci.c2
-rw-r--r--drivers/vlynq/Kconfig2
42 files changed, 118 insertions, 135 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 7594f65800cf..4bc1c4178f50 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1406,7 +1406,7 @@ acpi_os_invalidate_address(
1406 switch (space_id) { 1406 switch (space_id) {
1407 case ACPI_ADR_SPACE_SYSTEM_IO: 1407 case ACPI_ADR_SPACE_SYSTEM_IO:
1408 case ACPI_ADR_SPACE_SYSTEM_MEMORY: 1408 case ACPI_ADR_SPACE_SYSTEM_MEMORY:
1409 /* Only interference checks against SystemIO and SytemMemory 1409 /* Only interference checks against SystemIO and SystemMemory
1410 are needed */ 1410 are needed */
1411 res.start = address; 1411 res.start = address;
1412 res.end = address + length - 1; 1412 res.end = address + length - 1;
@@ -1458,7 +1458,7 @@ acpi_os_validate_address (
1458 switch (space_id) { 1458 switch (space_id) {
1459 case ACPI_ADR_SPACE_SYSTEM_IO: 1459 case ACPI_ADR_SPACE_SYSTEM_IO:
1460 case ACPI_ADR_SPACE_SYSTEM_MEMORY: 1460 case ACPI_ADR_SPACE_SYSTEM_MEMORY:
1461 /* Only interference checks against SystemIO and SytemMemory 1461 /* Only interference checks against SystemIO and SystemMemory
1462 are needed */ 1462 are needed */
1463 res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL); 1463 res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL);
1464 if (!res) 1464 if (!res)
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index ddc76787b842..f74d3b31e5c9 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -172,7 +172,6 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)
172 return -EINVAL; 172 return -EINVAL;
173 173
174 /* The state of the list is 'on' IFF all resources are 'on'. */ 174 /* The state of the list is 'on' IFF all resources are 'on'. */
175 /* */
176 175
177 for (i = 0; i < list->count; i++) { 176 for (i = 0; i < list->count; i++) {
178 /* 177 /*
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 83bc49fac9bb..ec52fc618763 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -43,7 +43,7 @@
43 * driver the list of errata that are relevant is below, going back to 43 * driver the list of errata that are relevant is below, going back to
44 * PIIX4. Older device documentation is now a bit tricky to find. 44 * PIIX4. Older device documentation is now a bit tricky to find.
45 * 45 *
46 * The chipsets all follow very much the same design. The orginal Triton 46 * The chipsets all follow very much the same design. The original Triton
47 * series chipsets do _not_ support independant device timings, but this 47 * series chipsets do _not_ support independant device timings, but this
48 * is fixed in Triton II. With the odd mobile exception the chips then 48 * is fixed in Triton II. With the odd mobile exception the chips then
49 * change little except in gaining more modes until SATA arrives. This 49 * change little except in gaining more modes until SATA arrives. This
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index eb5ff0531cfb..51ceaee98f9f 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1588,7 +1588,6 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
1588 1588
1589 c->Request = ioc->Request; 1589 c->Request = ioc->Request;
1590 if (ioc->buf_size > 0) { 1590 if (ioc->buf_size > 0) {
1591 int i;
1592 for (i = 0; i < sg_used; i++) { 1591 for (i = 0; i < sg_used; i++) {
1593 temp64.val = 1592 temp64.val =
1594 pci_map_single(host->pdev, buff[i], 1593 pci_map_single(host->pdev, buff[i],
@@ -2434,7 +2433,7 @@ static int deregister_disk(ctlr_info_t *h, int drv_index,
2434 2433
2435 /* if it was the last disk, find the new hightest lun */ 2434 /* if it was the last disk, find the new hightest lun */
2436 if (clear_all && recalculate_highest_lun) { 2435 if (clear_all && recalculate_highest_lun) {
2437 int i, newhighest = -1; 2436 int newhighest = -1;
2438 for (i = 0; i <= h->highest_lun; i++) { 2437 for (i = 0; i <= h->highest_lun; i++) {
2439 /* if the disk has size > 0, it is available */ 2438 /* if the disk has size > 0, it is available */
2440 if (h->drv[i] && h->drv[i]->heads) 2439 if (h->drv[i] && h->drv[i]->heads)
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index fb86708e47ed..4b51982fd23a 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -1214,7 +1214,7 @@ struct agp_memory *agp_generic_alloc_user(size_t page_count, int type)
1214 return NULL; 1214 return NULL;
1215 1215
1216 for (i = 0; i < page_count; i++) 1216 for (i = 0; i < page_count; i++)
1217 new->pages[i] = 0; 1217 new->pages[i] = NULL;
1218 new->page_count = 0; 1218 new->page_count = 0;
1219 new->type = type; 1219 new->type = type;
1220 new->num_scratch_pages = pages; 1220 new->num_scratch_pages = pages;
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 7fef305774de..89d871ef8c2f 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -253,7 +253,7 @@ static int bsr_add_node(struct device_node *bn)
253 253
254 cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev, 254 cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev,
255 cur, cur->bsr_name); 255 cur, cur->bsr_name);
256 if (!cur->bsr_device) { 256 if (IS_ERR(cur->bsr_device)) {
257 printk(KERN_ERR "device_create failed for %s\n", 257 printk(KERN_ERR "device_create failed for %s\n",
258 cur->bsr_name); 258 cur->bsr_name);
259 cdev_del(&cur->bsr_cdev); 259 cdev_del(&cur->bsr_cdev);
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 94b16e0340ae..a3b083a7403a 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -1351,7 +1351,7 @@ static void bus_reset_tasklet(unsigned long data)
1351 * was set up before this reset, the old one is now no longer 1351 * was set up before this reset, the old one is now no longer
1352 * in use and we can free it. Update the config rom pointers 1352 * in use and we can free it. Update the config rom pointers
1353 * to point to the current config rom and clear the 1353 * to point to the current config rom and clear the
1354 * next_config_rom pointer so a new udpate can take place. 1354 * next_config_rom pointer so a new update can take place.
1355 */ 1355 */
1356 1356
1357 if (ohci->next_config_rom != NULL) { 1357 if (ohci->next_config_rom != NULL) {
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index f7ba82ebf65a..2092e7bb788f 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -961,7 +961,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
961 dma->buflist[i + dma->buf_count] = &entry->buflist[i]; 961 dma->buflist[i + dma->buf_count] = &entry->buflist[i];
962 } 962 }
963 963
964 /* No allocations failed, so now we can replace the orginal pagelist 964 /* No allocations failed, so now we can replace the original pagelist
965 * with the new one. 965 * with the new one.
966 */ 966 */
967 if (dma->page_count) { 967 if (dma->page_count) {
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c7502b6b1600..f27e3703a716 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -905,9 +905,9 @@ intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
905 905
906 memset(best_clock, 0, sizeof(*best_clock)); 906 memset(best_clock, 0, sizeof(*best_clock));
907 max_n = limit->n.max; 907 max_n = limit->n.max;
908 /* based on hardware requriment prefer smaller n to precision */ 908 /* based on hardware requirement, prefer smaller n to precision */
909 for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) { 909 for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
910 /* based on hardware requirment prefere larger m1,m2 */ 910 /* based on hardware requirement, prefere larger m1,m2 */
911 for (clock.m1 = limit->m1.max; 911 for (clock.m1 = limit->m1.max;
912 clock.m1 >= limit->m1.min; clock.m1--) { 912 clock.m1 >= limit->m1.min; clock.m1--) {
913 for (clock.m2 = limit->m2.max; 913 for (clock.m2 = limit->m2.max;
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h
index 27e2c715be11..5319d9e2f7ba 100644
--- a/drivers/gpu/drm/radeon/atombios.h
+++ b/drivers/gpu/drm/radeon/atombios.h
@@ -3780,7 +3780,7 @@ typedef struct _ATOM_ASIC_SS_ASSIGNMENT
3780 UCHAR ucReserved[2]; 3780 UCHAR ucReserved[2];
3781}ATOM_ASIC_SS_ASSIGNMENT; 3781}ATOM_ASIC_SS_ASSIGNMENT;
3782 3782
3783//Define ucClockIndication, SW uses the IDs below to search if the SS is requried/enabled on a clock branch/signal type. 3783//Define ucClockIndication, SW uses the IDs below to search if the SS is required/enabled on a clock branch/signal type.
3784//SS is not required or enabled if a match is not found. 3784//SS is not required or enabled if a match is not found.
3785#define ASIC_INTERNAL_MEMORY_SS 1 3785#define ASIC_INTERNAL_MEMORY_SS 1
3786#define ASIC_INTERNAL_ENGINE_SS 2 3786#define ASIC_INTERNAL_ENGINE_SS 2
@@ -5895,7 +5895,7 @@ typedef struct _ATOM_PPLIB_RS780_CLOCK_INFO
5895 UCHAR ucPadding; // For proper alignment and size. 5895 UCHAR ucPadding; // For proper alignment and size.
5896 USHORT usVDDC; // For the 780, use: None, Low, High, Variable 5896 USHORT usVDDC; // For the 780, use: None, Low, High, Variable
5897 UCHAR ucMaxHTLinkWidth; // From SBIOS - {2, 4, 8, 16} 5897 UCHAR ucMaxHTLinkWidth; // From SBIOS - {2, 4, 8, 16}
5898 UCHAR ucMinHTLinkWidth; // From SBIOS - {2, 4, 8, 16}. Effective only if CDLW enabled. Minimum down stream width could be bigger as display BW requriement. 5898 UCHAR ucMinHTLinkWidth; // From SBIOS - {2, 4, 8, 16}. Effective only if CDLW enabled. Minimum down stream width could be bigger as display BW requirement.
5899 USHORT usHTLinkFreq; // See definition ATOM_PPLIB_RS780_HTLINKFREQ_xxx or in MHz(>=200). 5899 USHORT usHTLinkFreq; // See definition ATOM_PPLIB_RS780_HTLINKFREQ_xxx or in MHz(>=200).
5900 ULONG ulFlags; 5900 ULONG ulFlags;
5901} ATOM_PPLIB_RS780_CLOCK_INFO; 5901} ATOM_PPLIB_RS780_CLOCK_INFO;
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index 37d12e5efa49..1d7aea132a09 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -1474,7 +1474,7 @@ static void ipath_ht_quiet_serdes(struct ipath_devdata *dd)
1474/** 1474/**
1475 * ipath_pe_put_tid - write a TID in chip 1475 * ipath_pe_put_tid - write a TID in chip
1476 * @dd: the infinipath device 1476 * @dd: the infinipath device
1477 * @tidptr: pointer to the expected TID (in chip) to udpate 1477 * @tidptr: pointer to the expected TID (in chip) to update
1478 * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected 1478 * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected
1479 * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing 1479 * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing
1480 * 1480 *
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index fbf8c5379ea8..4b4a30b0dabd 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -1328,7 +1328,7 @@ bail:
1328/** 1328/**
1329 * ipath_pe_put_tid - write a TID in chip 1329 * ipath_pe_put_tid - write a TID in chip
1330 * @dd: the infinipath device 1330 * @dd: the infinipath device
1331 * @tidptr: pointer to the expected TID (in chip) to udpate 1331 * @tidptr: pointer to the expected TID (in chip) to update
1332 * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected 1332 * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected
1333 * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing 1333 * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing
1334 * 1334 *
@@ -1394,7 +1394,7 @@ static void ipath_pe_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr,
1394/** 1394/**
1395 * ipath_pe_put_tid_2 - write a TID in chip, Revision 2 or higher 1395 * ipath_pe_put_tid_2 - write a TID in chip, Revision 2 or higher
1396 * @dd: the infinipath device 1396 * @dd: the infinipath device
1397 * @tidptr: pointer to the expected TID (in chip) to udpate 1397 * @tidptr: pointer to the expected TID (in chip) to update
1398 * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected 1398 * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected
1399 * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing 1399 * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing
1400 * 1400 *
diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c
index a805402dd4ae..34b778ed97fc 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba7220.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c
@@ -1738,7 +1738,7 @@ bail:
1738/** 1738/**
1739 * ipath_7220_put_tid - write a TID to the chip 1739 * ipath_7220_put_tid - write a TID to the chip
1740 * @dd: the infinipath device 1740 * @dd: the infinipath device
1741 * @tidptr: pointer to the expected TID (in chip) to udpate 1741 * @tidptr: pointer to the expected TID (in chip) to update
1742 * @tidtype: 0 for eager, 1 for expected 1742 * @tidtype: 0 for eager, 1 for expected
1743 * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing 1743 * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing
1744 * 1744 *
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 75e71b5d9215..095ed76ebe80 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -117,7 +117,7 @@
117 * NOTE: only one mode value must be given for every card. 117 * NOTE: only one mode value must be given for every card.
118 * -> See hfc_multi.h for HFC_IO_MODE_* values 118 * -> See hfc_multi.h for HFC_IO_MODE_* values
119 * By default, the IO mode is pci memory IO (MEMIO). 119 * By default, the IO mode is pci memory IO (MEMIO).
120 * Some cards requre specific IO mode, so it cannot be changed. 120 * Some cards require specific IO mode, so it cannot be changed.
121 * It may be usefull to set IO mode to register io (REGIO) to solve 121 * It may be usefull to set IO mode to register io (REGIO) to solve
122 * PCI bridge problems. 122 * PCI bridge problems.
123 * If unsure, don't give this parameter. 123 * If unsure, don't give this parameter.
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index 051b44e2556c..384d5118e325 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -310,7 +310,7 @@ wait_busy(hfc4s8s_hw * a)
310 310
311/******************************************************/ 311/******************************************************/
312/* function to read critical counter registers that */ 312/* function to read critical counter registers that */
313/* may be udpated by the chip during read */ 313/* may be updated by the chip during read */
314/******************************************************/ 314/******************************************************/
315static u_char 315static u_char
316Read_hfc8_stable(hfc4s8s_hw * hw, int reg) 316Read_hfc8_stable(hfc4s8s_hw * hw, int reg)
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index 565d5b2adc95..129cda737880 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -188,7 +188,7 @@ struct wf_smu_sys_fans_state {
188}; 188};
189 189
190/* 190/*
191 * Configs for SMU Sytem Fan control loop 191 * Configs for SMU System Fan control loop
192 */ 192 */
193static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { 193static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
194 /* Model ID 2 */ 194 /* Model ID 2 */
diff --git a/drivers/media/dvb/dvb-usb/friio-fe.c b/drivers/media/dvb/dvb-usb/friio-fe.c
index d14bd227b502..93c21ddd0b77 100644
--- a/drivers/media/dvb/dvb-usb/friio-fe.c
+++ b/drivers/media/dvb/dvb-usb/friio-fe.c
@@ -300,7 +300,7 @@ static int jdvbt90502_set_frontend(struct dvb_frontend *fe,
300 struct dvb_frontend_parameters *p) 300 struct dvb_frontend_parameters *p)
301{ 301{
302 /** 302 /**
303 * NOTE: ignore all the paramters except frequency. 303 * NOTE: ignore all the parameters except frequency.
304 * others should be fixed to the proper value for ISDB-T, 304 * others should be fixed to the proper value for ISDB-T,
305 * but don't check here. 305 * but don't check here.
306 */ 306 */
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 11073fa3d9f4..d33693c13368 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -314,22 +314,22 @@ static int i2o_cfg_swul(unsigned long arg)
314 int ret = 0; 314 int ret = 0;
315 315
316 if (copy_from_user(&kxfer, pxfer, sizeof(struct i2o_sw_xfer))) 316 if (copy_from_user(&kxfer, pxfer, sizeof(struct i2o_sw_xfer)))
317 goto return_fault; 317 return -EFAULT;
318 318
319 if (get_user(swlen, kxfer.swlen) < 0) 319 if (get_user(swlen, kxfer.swlen) < 0)
320 goto return_fault; 320 return -EFAULT;
321 321
322 if (get_user(maxfrag, kxfer.maxfrag) < 0) 322 if (get_user(maxfrag, kxfer.maxfrag) < 0)
323 goto return_fault; 323 return -EFAULT;
324 324
325 if (get_user(curfrag, kxfer.curfrag) < 0) 325 if (get_user(curfrag, kxfer.curfrag) < 0)
326 goto return_fault; 326 return -EFAULT;
327 327
328 if (curfrag == maxfrag) 328 if (curfrag == maxfrag)
329 fragsize = swlen - (maxfrag - 1) * 8192; 329 fragsize = swlen - (maxfrag - 1) * 8192;
330 330
331 if (!kxfer.buf) 331 if (!kxfer.buf)
332 goto return_fault; 332 return -EFAULT;
333 333
334 c = i2o_find_iop(kxfer.iop); 334 c = i2o_find_iop(kxfer.iop);
335 if (!c) 335 if (!c)
@@ -373,12 +373,8 @@ static int i2o_cfg_swul(unsigned long arg)
373 373
374 i2o_dma_free(&c->pdev->dev, &buffer); 374 i2o_dma_free(&c->pdev->dev, &buffer);
375 375
376 return_ret:
377 return ret; 376 return ret;
378 return_fault: 377}
379 ret = -EFAULT;
380 goto return_ret;
381};
382 378
383static int i2o_cfg_swdel(unsigned long arg) 379static int i2o_cfg_swdel(unsigned long arg)
384{ 380{
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c
index f939ebc2507c..e306a8cd2f96 100644
--- a/drivers/misc/eeprom/eeprom.c
+++ b/drivers/misc/eeprom/eeprom.c
@@ -1,24 +1,20 @@
1/* 1/*
2 Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and 2 * Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and
3 Philip Edelbrock <phil@netroedge.com> 3 * Philip Edelbrock <phil@netroedge.com>
4 Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> 4 * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
5 Copyright (C) 2003 IBM Corp. 5 * Copyright (C) 2003 IBM Corp.
6 Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> 6 * Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 */
18 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21*/
22 18
23#include <linux/kernel.h> 19#include <linux/kernel.h>
24#include <linux/init.h> 20#include <linux/init.h>
diff --git a/drivers/misc/eeprom/eeprom_93cx6.c b/drivers/misc/eeprom/eeprom_93cx6.c
index 15b1780025c8..7b33de95c4bf 100644
--- a/drivers/misc/eeprom/eeprom_93cx6.c
+++ b/drivers/misc/eeprom/eeprom_93cx6.c
@@ -1,27 +1,20 @@
1/* 1/*
2 Copyright (C) 2004 - 2006 rt2x00 SourceForge Project 2 * Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
3 <http://rt2x00.serialmonkey.com> 3 * <http://rt2x00.serialmonkey.com>
4 4 *
5 This program is free software; you can redistribute it and/or modify 5 * This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 * it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 * the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 * (at your option) any later version.
9 9 *
10 This program is distributed in the hope that it will be useful, 10 * This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 * GNU General Public License for more details.
14 14 *
15 You should have received a copy of the GNU General Public License 15 * Module: eeprom_93cx6
16 along with this program; if not, write to the 16 * Abstract: EEPROM reader routines for 93cx6 chipsets.
17 Free Software Foundation, Inc., 17 * Supported chipsets: 93c46 & 93c66.
18 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19 */
20
21/*
22 Module: eeprom_93cx6
23 Abstract: EEPROM reader routines for 93cx6 chipsets.
24 Supported chipsets: 93c46 & 93c66.
25 */ 18 */
26 19
27#include <linux/kernel.h> 20#include <linux/kernel.h>
diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c
index 5a6b2bce8ad5..fe2909278507 100644
--- a/drivers/misc/eeprom/max6875.c
+++ b/drivers/misc/eeprom/max6875.c
@@ -1,30 +1,30 @@
1/* 1/*
2 max6875.c - driver for MAX6874/MAX6875 2 * max6875.c - driver for MAX6874/MAX6875
3 3 *
4 Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com> 4 * Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
5 5 *
6 Based on eeprom.c 6 * Based on eeprom.c
7 7 *
8 The MAX6875 has a bank of registers and two banks of EEPROM. 8 * The MAX6875 has a bank of registers and two banks of EEPROM.
9 Address ranges are defined as follows: 9 * Address ranges are defined as follows:
10 * 0x0000 - 0x0046 = configuration registers 10 * * 0x0000 - 0x0046 = configuration registers
11 * 0x8000 - 0x8046 = configuration EEPROM 11 * * 0x8000 - 0x8046 = configuration EEPROM
12 * 0x8100 - 0x82FF = user EEPROM 12 * * 0x8100 - 0x82FF = user EEPROM
13 13 *
14 This driver makes the user EEPROM available for read. 14 * This driver makes the user EEPROM available for read.
15 15 *
16 The registers & config EEPROM should be accessed via i2c-dev. 16 * The registers & config EEPROM should be accessed via i2c-dev.
17 17 *
18 The MAX6875 ignores the lowest address bit, so each chip responds to 18 * The MAX6875 ignores the lowest address bit, so each chip responds to
19 two addresses - 0x50/0x51 and 0x52/0x53. 19 * two addresses - 0x50/0x51 and 0x52/0x53.
20 20 *
21 Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read 21 * Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read
22 address, so this driver is destructive if loaded for the wrong EEPROM chip. 22 * address, so this driver is destructive if loaded for the wrong EEPROM chip.
23 23 *
24 This program is free software; you can redistribute it and/or modify 24 * This program is free software; you can redistribute it and/or modify
25 it under the terms of the GNU General Public License as published by 25 * it under the terms of the GNU General Public License as published by
26 the Free Software Foundation; version 2 of the License. 26 * the Free Software Foundation; version 2 of the License.
27*/ 27 */
28 28
29#include <linux/kernel.h> 29#include <linux/kernel.h>
30#include <linux/init.h> 30#include <linux/init.h>
diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h
index 760069345b11..fd1f29e0317d 100644
--- a/drivers/net/bnx2x_hsi.h
+++ b/drivers/net/bnx2x_hsi.h
@@ -683,7 +683,7 @@ struct drv_func_mb {
683#define DRV_MSG_CODE_GET_MANUF_KEY 0x82000000 683#define DRV_MSG_CODE_GET_MANUF_KEY 0x82000000
684#define DRV_MSG_CODE_LOAD_L2B_PRAM 0x90000000 684#define DRV_MSG_CODE_LOAD_L2B_PRAM 0x90000000
685 /* 685 /*
686 * The optic module verification commands requris bootcode 686 * The optic module verification commands require bootcode
687 * v5.0.6 or later 687 * v5.0.6 or later
688 */ 688 */
689#define DRV_MSG_CODE_VRFY_OPT_MDL 0xa0000000 689#define DRV_MSG_CODE_VRFY_OPT_MDL 0xa0000000
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index f0be507e5324..369a8016b1ff 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -96,7 +96,7 @@ static inline int precise_ie(void)
96 * post_eurus_cmd helpers 96 * post_eurus_cmd helpers
97 */ 97 */
98struct eurus_cmd_arg_info { 98struct eurus_cmd_arg_info {
99 int pre_arg; /* command requres arg1, arg2 at POST COMMAND */ 99 int pre_arg; /* command requires arg1, arg2 at POST COMMAND */
100 int post_arg; /* command requires arg1, arg2 at GET_RESULT */ 100 int post_arg; /* command requires arg1, arg2 at GET_RESULT */
101}; 101};
102 102
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index cbf520d38eac..ffbaa608e002 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -736,7 +736,7 @@ static void smsc911x_phy_adjust_link(struct net_device *dev)
736 SMSC_TRACE(HW, "configuring for carrier OK"); 736 SMSC_TRACE(HW, "configuring for carrier OK");
737 if ((pdata->gpio_orig_setting & GPIO_CFG_LED1_EN_) && 737 if ((pdata->gpio_orig_setting & GPIO_CFG_LED1_EN_) &&
738 (!pdata->using_extphy)) { 738 (!pdata->using_extphy)) {
739 /* Restore orginal GPIO configuration */ 739 /* Restore original GPIO configuration */
740 pdata->gpio_setting = pdata->gpio_orig_setting; 740 pdata->gpio_setting = pdata->gpio_orig_setting;
741 smsc911x_reg_write(pdata, GPIO_CFG, 741 smsc911x_reg_write(pdata, GPIO_CFG,
742 pdata->gpio_setting); 742 pdata->gpio_setting);
@@ -750,7 +750,7 @@ static void smsc911x_phy_adjust_link(struct net_device *dev)
750 if ((pdata->gpio_setting & GPIO_CFG_LED1_EN_) && 750 if ((pdata->gpio_setting & GPIO_CFG_LED1_EN_) &&
751 (!pdata->using_extphy)) { 751 (!pdata->using_extphy)) {
752 /* Force 10/100 LED off, after saving 752 /* Force 10/100 LED off, after saving
753 * orginal GPIO configuration */ 753 * original GPIO configuration */
754 pdata->gpio_orig_setting = pdata->gpio_setting; 754 pdata->gpio_orig_setting = pdata->gpio_setting;
755 755
756 pdata->gpio_setting &= ~GPIO_CFG_LED1_EN_; 756 pdata->gpio_setting &= ~GPIO_CFG_LED1_EN_;
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index f184d1d2ecbe..6644337d63d6 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -848,7 +848,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
848 goto err_disable_device; 848 goto err_disable_device;
849 } 849 }
850 850
851 /* Check for the proper subsytem ID's 851 /* Check for the proper subsystem ID's
852 * Intel uses a different SSID programming model than Compaq. 852 * Intel uses a different SSID programming model than Compaq.
853 * For Intel, each SSID bit identifies a PHP capability. 853 * For Intel, each SSID bit identifies a PHP capability.
854 * Also Intel HPC's may have RID=0. 854 * Also Intel HPC's may have RID=0.
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 37499127c801..1df7c508814e 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1503,7 +1503,7 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
1503 * pci_back_from_sleep - turn PCI device on during system-wide transition into working state 1503 * pci_back_from_sleep - turn PCI device on during system-wide transition into working state
1504 * @dev: Device to handle. 1504 * @dev: Device to handle.
1505 * 1505 *
1506 * Disable device's sytem wake-up capability and put it into D0. 1506 * Disable device's system wake-up capability and put it into D0.
1507 */ 1507 */
1508int pci_back_from_sleep(struct pci_dev *dev) 1508int pci_back_from_sleep(struct pci_dev *dev)
1509{ 1509{
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 4eb10f48d270..f8077b3c8c8c 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -244,7 +244,7 @@ struct pci_ats {
244 int stu; /* Smallest Translation Unit */ 244 int stu; /* Smallest Translation Unit */
245 int qdep; /* Invalidate Queue Depth */ 245 int qdep; /* Invalidate Queue Depth */
246 int ref_cnt; /* Physical Function reference count */ 246 int ref_cnt; /* Physical Function reference count */
247 int is_enabled:1; /* Enable bit is set */ 247 unsigned int is_enabled:1; /* Enable bit is set */
248}; 248};
249 249
250#ifdef CONFIG_PCI_IOV 250#ifdef CONFIG_PCI_IOV
diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c
index 3cbaf1811bd0..d37c445f0eda 100644
--- a/drivers/ps3/ps3-sys-manager.c
+++ b/drivers/ps3/ps3-sys-manager.c
@@ -119,7 +119,7 @@ enum ps3_sys_manager_service_id {
119 * enum ps3_sys_manager_attr - Notification attribute (bit position mask). 119 * enum ps3_sys_manager_attr - Notification attribute (bit position mask).
120 * @PS3_SM_ATTR_POWER: Power button. 120 * @PS3_SM_ATTR_POWER: Power button.
121 * @PS3_SM_ATTR_RESET: Reset button, not available on retail console. 121 * @PS3_SM_ATTR_RESET: Reset button, not available on retail console.
122 * @PS3_SM_ATTR_THERMAL: Sytem thermal alert. 122 * @PS3_SM_ATTR_THERMAL: System thermal alert.
123 * @PS3_SM_ATTR_CONTROLLER: Remote controller event. 123 * @PS3_SM_ATTR_CONTROLLER: Remote controller event.
124 * @PS3_SM_ATTR_ALL: Logical OR of all. 124 * @PS3_SM_ATTR_ALL: Logical OR of all.
125 * 125 *
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 2b4e40d31190..51cf2bb37438 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1540,7 +1540,7 @@ EXPORT_SYMBOL_GPL(regulator_count_voltages);
1540 * Context: can sleep 1540 * Context: can sleep
1541 * 1541 *
1542 * Returns a voltage that can be passed to @regulator_set_voltage(), 1542 * Returns a voltage that can be passed to @regulator_set_voltage(),
1543 * zero if this selector code can't be used on this sytem, or a 1543 * zero if this selector code can't be used on this system, or a
1544 * negative errno. 1544 * negative errno.
1545 */ 1545 */
1546int regulator_list_voltage(struct regulator *regulator, unsigned selector) 1546int regulator_list_voltage(struct regulator *regulator, unsigned selector)
diff --git a/drivers/rtc/rtc-rx8581.c b/drivers/rtc/rtc-rx8581.c
index c9522f3bc21c..9718aaaa8215 100644
--- a/drivers/rtc/rtc-rx8581.c
+++ b/drivers/rtc/rtc-rx8581.c
@@ -1,8 +1,8 @@
1/* 1/*
2 * An I2C driver for the Epson RX8581 RTC 2 * An I2C driver for the Epson RX8581 RTC
3 * 3 *
4 * Author: Martyn Welch <martyn.welch@gefanuc.com> 4 * Author: Martyn Welch <martyn.welch@ge.com>
5 * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. 5 * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as 8 * it under the terms of the GNU General Public License version 2 as
@@ -272,7 +272,7 @@ static void __exit rx8581_exit(void)
272 i2c_del_driver(&rx8581_driver); 272 i2c_del_driver(&rx8581_driver);
273} 273}
274 274
275MODULE_AUTHOR("Martyn Welch <martyn.welch@gefanuc.com>"); 275MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>");
276MODULE_DESCRIPTION("Epson RX-8581 RTC driver"); 276MODULE_DESCRIPTION("Epson RX-8581 RTC driver");
277MODULE_LICENSE("GPL"); 277MODULE_LICENSE("GPL");
278MODULE_VERSION(DRV_VERSION); 278MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index 875ba099e7a5..b53a00198dbe 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * A RTC driver for the Simtek STK17TA8 2 * A RTC driver for the Simtek STK17TA8
3 * 3 *
4 * By Thomas Hommel <thomas.hommel@gefanuc.com> 4 * By Thomas Hommel <thomas.hommel@ge.com>
5 * 5 *
6 * Based on the DS1553 driver from 6 * Based on the DS1553 driver from
7 * Atsushi Nemoto <anemo@mba.ocn.ne.jp> 7 * Atsushi Nemoto <anemo@mba.ocn.ne.jp>
@@ -382,7 +382,7 @@ static __exit void stk17ta8_exit(void)
382module_init(stk17ta8_init); 382module_init(stk17ta8_init);
383module_exit(stk17ta8_exit); 383module_exit(stk17ta8_exit);
384 384
385MODULE_AUTHOR("Thomas Hommel <thomas.hommel@gefanuc.com>"); 385MODULE_AUTHOR("Thomas Hommel <thomas.hommel@ge.com>");
386MODULE_DESCRIPTION("Simtek STK17TA8 RTC driver"); 386MODULE_DESCRIPTION("Simtek STK17TA8 RTC driver");
387MODULE_LICENSE("GPL"); 387MODULE_LICENSE("GPL");
388MODULE_VERSION(DRV_VERSION); 388MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c
index 62c2647f37f4..4a51e3f09689 100644
--- a/drivers/s390/char/sclp_cpi_sys.c
+++ b/drivers/s390/char/sclp_cpi_sys.c
@@ -102,7 +102,7 @@ static struct sclp_req *cpi_prepare_req(void)
102 /* set system name */ 102 /* set system name */
103 set_data(evb->system_name, system_name); 103 set_data(evb->system_name, system_name);
104 104
105 /* set sytem level */ 105 /* set system level */
106 evb->system_level = system_level; 106 evb->system_level = system_level;
107 107
108 /* set sysplex name */ 108 /* set sysplex name */
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_cee.h b/drivers/scsi/bfa/include/defs/bfa_defs_cee.h
index b0ac9ac15c5d..6eaf519eccdc 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_cee.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_cee.h
@@ -50,7 +50,7 @@ struct bfa_cee_lldp_str_s {
50}; 50};
51 51
52 52
53/* LLDP paramters */ 53/* LLDP parameters */
54struct bfa_cee_lldp_cfg_s { 54struct bfa_cee_lldp_cfg_s {
55 struct bfa_cee_lldp_str_s chassis_id; 55 struct bfa_cee_lldp_str_s chassis_id;
56 struct bfa_cee_lldp_str_s port_id; 56 struct bfa_cee_lldp_str_s port_id;
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_status.h b/drivers/scsi/bfa/include/defs/bfa_defs_status.h
index 4374494bd566..ec78b4cb121a 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_status.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_status.h
@@ -223,9 +223,9 @@ enum bfa_status {
223 BFA_STATUS_IM_PVID_NON_ZERO = 140, /* Port VLAN ID (PVID) is Set to 223 BFA_STATUS_IM_PVID_NON_ZERO = 140, /* Port VLAN ID (PVID) is Set to
224 * Non-Zero Value */ 224 * Non-Zero Value */
225 BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /* Acquiring Network 225 BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /* Acquiring Network
226 * Subsytem Lock Failed.Please 226 * Subsystem Lock Failed.Please
227 * try after some time */ 227 * try after some time */
228 BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /* Acquiring Network Subsytem 228 BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /* Acquiring Network Subsystem
229 * handle Failed. Please try 229 * handle Failed. Please try
230 * after some time */ 230 * after some time */
231 BFA_STATUS_IM_NOT_BOUND = 143, /* IM driver is not active */ 231 BFA_STATUS_IM_NOT_BOUND = 143, /* IM driver is not active */
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
index 14d052316502..e324627d97a2 100644
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@ -640,7 +640,7 @@ static int mpc8xxx_spi_setup(struct spi_device *spi)
640 } 640 }
641 mpc8xxx_spi = spi_master_get_devdata(spi->master); 641 mpc8xxx_spi = spi_master_get_devdata(spi->master);
642 642
643 hw_mode = cs->hw_mode; /* Save orginal settings */ 643 hw_mode = cs->hw_mode; /* Save original settings */
644 cs->hw_mode = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode); 644 cs->hw_mode = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode);
645 /* mask out bits we are going to set */ 645 /* mask out bits we are going to set */
646 cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH 646 cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index ed3070edcac1..4fcc4351e73f 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -25,19 +25,19 @@
25 * Date: May 20, 2003 25 * Date: May 20, 2003
26 * 26 *
27 * Functions: 27 * Functions:
28 * s_vGenerateTxParameter - Generate tx dma requried parameter. 28 * s_vGenerateTxParameter - Generate tx dma required parameter.
29 * vGenerateMACHeader - Translate 802.3 to 802.11 header 29 * vGenerateMACHeader - Translate 802.3 to 802.11 header
30 * cbGetFragCount - Caculate fragement number count 30 * cbGetFragCount - Caculate fragment number count
31 * csBeacon_xmit - beacon tx function 31 * csBeacon_xmit - beacon tx function
32 * csMgmt_xmit - management tx function 32 * csMgmt_xmit - management tx function
33 * s_cbFillTxBufHead - fulfill tx dma buffer header 33 * s_cbFillTxBufHead - fulfill tx dma buffer header
34 * s_uGetDataDuration - get tx data required duration 34 * s_uGetDataDuration - get tx data required duration
35 * s_uFillDataHead- fulfill tx data duration header 35 * s_uFillDataHead- fulfill tx data duration header
36 * s_uGetRTSCTSDuration- get rtx/cts requried duration 36 * s_uGetRTSCTSDuration- get rtx/cts required duration
37 * s_uGetRTSCTSRsvTime- get rts/cts reserved time 37 * s_uGetRTSCTSRsvTime- get rts/cts reserved time
38 * s_uGetTxRsvTime- get frame reserved time 38 * s_uGetTxRsvTime- get frame reserved time
39 * s_vFillCTSHead- fulfill CTS ctl header 39 * s_vFillCTSHead- fulfill CTS ctl header
40 * s_vFillFragParameter- Set fragement ctl parameter. 40 * s_vFillFragParameter- Set fragment ctl parameter.
41 * s_vFillRTSHead- fulfill RTS ctl header 41 * s_vFillRTSHead- fulfill RTS ctl header
42 * s_vFillTxKey- fulfill tx encrypt key 42 * s_vFillTxKey- fulfill tx encrypt key
43 * s_vSWencryption- Software encrypt header 43 * s_vSWencryption- Software encrypt header
@@ -877,7 +877,7 @@ s_vFillRTSHead (
877 } 877 }
878 878
879 // Note: So far RTSHead dosen't appear in ATIM & Beacom DMA, so we don't need to take them into account. 879 // Note: So far RTSHead dosen't appear in ATIM & Beacom DMA, so we don't need to take them into account.
880 // Otherwise, we need to modified codes for them. 880 // Otherwise, we need to modify codes for them.
881 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { 881 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
882 if (byFBOption == AUTO_FB_NONE) { 882 if (byFBOption == AUTO_FB_NONE) {
883 PSRTS_g pBuf = (PSRTS_g)pvRTS; 883 PSRTS_g pBuf = (PSRTS_g)pvRTS;
@@ -1133,7 +1133,7 @@ s_vFillCTSHead (
1133 * 1133 *
1134 * Parameters: 1134 * Parameters:
1135 * In: 1135 * In:
1136 * pDevice - Pointer to adpater 1136 * pDevice - Pointer to adapter
1137 * pTxDataHead - Transmit Data Buffer 1137 * pTxDataHead - Transmit Data Buffer
1138 * pTxBufHead - pTxBufHead 1138 * pTxBufHead - pTxBufHead
1139 * pvRrvTime - pvRrvTime 1139 * pvRrvTime - pvRrvTime
@@ -2252,7 +2252,7 @@ vGenerateFIFOHeader (
2252 * 2252 *
2253 * Parameters: 2253 * Parameters:
2254 * In: 2254 * In:
2255 * pDevice - Pointer to adpater 2255 * pDevice - Pointer to adapter
2256 * dwTxBufferAddr - Transmit Buffer 2256 * dwTxBufferAddr - Transmit Buffer
2257 * pPacket - Packet from upper layer 2257 * pPacket - Packet from upper layer
2258 * cbPacketSize - Transmit Data Length 2258 * cbPacketSize - Transmit Data Length
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index d9fa36c95230..a2ce6fad8ee5 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -25,17 +25,17 @@
25 * Date: May 20, 2003 25 * Date: May 20, 2003
26 * 26 *
27 * Functions: 27 * Functions:
28 * s_vGenerateTxParameter - Generate tx dma requried parameter. 28 * s_vGenerateTxParameter - Generate tx dma required parameter.
29 * s_vGenerateMACHeader - Translate 802.3 to 802.11 header 29 * s_vGenerateMACHeader - Translate 802.3 to 802.11 header
30 * csBeacon_xmit - beacon tx function 30 * csBeacon_xmit - beacon tx function
31 * csMgmt_xmit - management tx function 31 * csMgmt_xmit - management tx function
32 * s_uGetDataDuration - get tx data required duration 32 * s_uGetDataDuration - get tx data required duration
33 * s_uFillDataHead- fulfill tx data duration header 33 * s_uFillDataHead- fulfill tx data duration header
34 * s_uGetRTSCTSDuration- get rtx/cts requried duration 34 * s_uGetRTSCTSDuration- get rtx/cts required duration
35 * s_uGetRTSCTSRsvTime- get rts/cts reserved time 35 * s_uGetRTSCTSRsvTime- get rts/cts reserved time
36 * s_uGetTxRsvTime- get frame reserved time 36 * s_uGetTxRsvTime- get frame reserved time
37 * s_vFillCTSHead- fulfill CTS ctl header 37 * s_vFillCTSHead- fulfill CTS ctl header
38 * s_vFillFragParameter- Set fragement ctl parameter. 38 * s_vFillFragParameter- Set fragment ctl parameter.
39 * s_vFillRTSHead- fulfill RTS ctl header 39 * s_vFillRTSHead- fulfill RTS ctl header
40 * s_vFillTxKey- fulfill tx encrypt key 40 * s_vFillTxKey- fulfill tx encrypt key
41 * s_vSWencryption- Software encrypt header 41 * s_vSWencryption- Software encrypt header
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 40a858335035..0cd6c7795d90 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -181,7 +181,7 @@ struct ehci_hcd_omap {
181 void __iomem *ehci_base; 181 void __iomem *ehci_base;
182 182
183 /* Regulators for USB PHYs. 183 /* Regulators for USB PHYs.
184 * Each PHY can have a seperate regulator. 184 * Each PHY can have a separate regulator.
185 */ 185 */
186 struct regulator *regulator[OMAP3_HS_USB_PORTS]; 186 struct regulator *regulator[OMAP3_HS_USB_PORTS];
187}; 187};
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 112ef7e26f6b..608d61a105f6 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -76,7 +76,7 @@
76 * xfers-per-ripe, blocks-per-rpipe, rpipes-per-host), at the end 76 * xfers-per-ripe, blocks-per-rpipe, rpipes-per-host), at the end
77 * we are going to have to rebuild all this based on an scheduler, 77 * we are going to have to rebuild all this based on an scheduler,
78 * to where we have a list of transactions to do and based on the 78 * to where we have a list of transactions to do and based on the
79 * availability of the different requried components (blocks, 79 * availability of the different required components (blocks,
80 * rpipes, segment slots, etc), we go scheduling them. Painful. 80 * rpipes, segment slots, etc), we go scheduling them. Painful.
81 */ 81 */
82#include <linux/init.h> 82#include <linux/init.h>
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
index 5eb61b5adfe8..42fe155aba0e 100644
--- a/drivers/video/cobalt_lcdfb.c
+++ b/drivers/video/cobalt_lcdfb.c
@@ -123,7 +123,7 @@ static void lcd_clear(struct fb_info *info)
123 lcd_write_control(info, LCD_RESET); 123 lcd_write_control(info, LCD_RESET);
124} 124}
125 125
126static struct fb_fix_screeninfo cobalt_lcdfb_fix __initdata = { 126static struct fb_fix_screeninfo cobalt_lcdfb_fix __devinitdata = {
127 .id = "cobalt-lcd", 127 .id = "cobalt-lcd",
128 .type = FB_TYPE_TEXT, 128 .type = FB_TYPE_TEXT,
129 .type_aux = FB_AUX_TEXT_MDA, 129 .type_aux = FB_AUX_TEXT_MDA,
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 24747aef1952..95896f387927 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -655,7 +655,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
655 /* we use the subsystem vendor/device id as the virtio vendor/device 655 /* we use the subsystem vendor/device id as the virtio vendor/device
656 * id. this allows us to use the same PCI vendor/device id for all 656 * id. this allows us to use the same PCI vendor/device id for all
657 * virtio devices and to identify the particular virtio driver by 657 * virtio devices and to identify the particular virtio driver by
658 * the subsytem ids */ 658 * the subsystem ids */
659 vp_dev->vdev.id.vendor = pci_dev->subsystem_vendor; 659 vp_dev->vdev.id.vendor = pci_dev->subsystem_vendor;
660 vp_dev->vdev.id.device = pci_dev->subsystem_device; 660 vp_dev->vdev.id.device = pci_dev->subsystem_device;
661 661
diff --git a/drivers/vlynq/Kconfig b/drivers/vlynq/Kconfig
index a9efb1625321..d874b4f34136 100644
--- a/drivers/vlynq/Kconfig
+++ b/drivers/vlynq/Kconfig
@@ -1,8 +1,8 @@
1menu "TI VLYNQ" 1menu "TI VLYNQ"
2 depends on AR7 && EXPERIMENTAL
2 3
3config VLYNQ 4config VLYNQ
4 bool "TI VLYNQ bus support" 5 bool "TI VLYNQ bus support"
5 depends on AR7 && EXPERIMENTAL
6 help 6 help
7 Support for Texas Instruments(R) VLYNQ bus. 7 Support for Texas Instruments(R) VLYNQ bus.
8 The VLYNQ bus is a high-speed, serial and packetized 8 The VLYNQ bus is a high-speed, serial and packetized