diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/scsi/sym53c8xx_2 | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/sym53c8xx_2')
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_glue.c | 6 | ||||
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 | ||||
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 45374d66d26a..8b955b534a36 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c | |||
@@ -984,7 +984,7 @@ static void sym_exec_user_command (struct sym_hcb *np, struct sym_usrcmd *uc) | |||
984 | } | 984 | } |
985 | } | 985 | } |
986 | 986 | ||
987 | static int skip_spaces(char *ptr, int len) | 987 | static int sym_skip_spaces(char *ptr, int len) |
988 | { | 988 | { |
989 | int cnt, c; | 989 | int cnt, c; |
990 | 990 | ||
@@ -1012,7 +1012,7 @@ static int is_keyword(char *ptr, int len, char *verb) | |||
1012 | } | 1012 | } |
1013 | 1013 | ||
1014 | #define SKIP_SPACES(ptr, len) \ | 1014 | #define SKIP_SPACES(ptr, len) \ |
1015 | if ((arg_len = skip_spaces(ptr, len)) < 1) \ | 1015 | if ((arg_len = sym_skip_spaces(ptr, len)) < 1) \ |
1016 | return -EINVAL; \ | 1016 | return -EINVAL; \ |
1017 | ptr += arg_len; len -= arg_len; | 1017 | ptr += arg_len; len -= arg_len; |
1018 | 1018 | ||
@@ -1864,7 +1864,7 @@ static pci_ers_result_t sym2_io_slot_dump(struct pci_dev *pdev) | |||
1864 | * | 1864 | * |
1865 | * This routine is similar to sym_set_workarounds(), except | 1865 | * This routine is similar to sym_set_workarounds(), except |
1866 | * that, at this point, we already know that the device was | 1866 | * that, at this point, we already know that the device was |
1867 | * succesfully intialized at least once before, and so most | 1867 | * successfully intialized at least once before, and so most |
1868 | * of the steps taken there are un-needed here. | 1868 | * of the steps taken there are un-needed here. |
1869 | */ | 1869 | */ |
1870 | static void sym2_reset_workarounds(struct pci_dev *pdev) | 1870 | static void sym2_reset_workarounds(struct pci_dev *pdev) |
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index 297deb817a5d..a7bc8b7b09ac 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c | |||
@@ -2692,7 +2692,7 @@ static void sym_int_ma (struct sym_hcb *np) | |||
2692 | * we force a SIR_NEGO_PROTO interrupt (it is a hack that avoids | 2692 | * we force a SIR_NEGO_PROTO interrupt (it is a hack that avoids |
2693 | * bloat for such a should_not_happen situation). | 2693 | * bloat for such a should_not_happen situation). |
2694 | * In all other situation, we reset the BUS. | 2694 | * In all other situation, we reset the BUS. |
2695 | * Are these assumptions reasonnable ? (Wait and see ...) | 2695 | * Are these assumptions reasonable ? (Wait and see ...) |
2696 | */ | 2696 | */ |
2697 | unexpected_phase: | 2697 | unexpected_phase: |
2698 | dsp -= 8; | 2698 | dsp -= 8; |
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h index 053e63c86822..5a80cbac3f92 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.h +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h | |||
@@ -54,7 +54,7 @@ | |||
54 | * | 54 | * |
55 | * SYM_OPT_LIMIT_COMMAND_REORDERING | 55 | * SYM_OPT_LIMIT_COMMAND_REORDERING |
56 | * When this option is set, the driver tries to limit tagged | 56 | * When this option is set, the driver tries to limit tagged |
57 | * command reordering to some reasonnable value. | 57 | * command reordering to some reasonable value. |
58 | * (set for Linux) | 58 | * (set for Linux) |
59 | */ | 59 | */ |
60 | #if 0 | 60 | #if 0 |