Merge branch 'master' into upstream

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/libata-scsi.c
	include/linux/pci_ids.h

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/scsi/aic7xxx/aic7xxx_proc.c b/drivers/scsi/aic7xxx/aic7xxx_proc.c
index 04a3506cf340..5914b4aa4a8f 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_proc.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_proc.c
@@ -77,11 +77,9 @@ static u_int
 ahc_calc_syncsrate(u_int period_factor)
 {
         int i;
-        int num_syncrates;
 
-        num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
         /* See if the period is in the "exception" table */
-        for (i = 0; i < num_syncrates; i++) {
+        for (i = 0; i < ARRAY_SIZE(scsi_syncrates); i++) {
 
                 if (period_factor == scsi_syncrates[i].period_factor) {
                         /* Period in kHz */