ide: remove obsoleted "idebus=" kernel parameter

* Remove obsoleted "idebus=" kernel parameter.

* Remove no longer needed ide_system_bus_speed() and system_bus_clock()
  (together with idebus_parameter and system_bus_speed variables).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 8823df1..f65be73 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -86,9 +86,6 @@ static const u8 ide_hwif_to_major[] = { IDE0_MAJOR, IDE1_MAJOR,
                                        IDE6_MAJOR, IDE7_MAJOR,
                                        IDE8_MAJOR, IDE9_MAJOR };
 
-static int idebus_parameter;   /* holds the "idebus=" parameter */
-static int system_bus_speed;   /* holds what we think is VESA/PCI bus speed */
-
 DEFINE_MUTEX(ide_cfg_mtx);
  __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock);
 
@@ -189,38 +186,6 @@ static void __init init_ide_data (void)
        }
 }
 
-/**
- *     ide_system_bus_speed    -       guess bus speed
- *
- *     ide_system_bus_speed() returns what we think is the system VESA/PCI
- *     bus speed (in MHz). This is used for calculating interface PIO timings.
- *     The default is 40 for known PCI systems, 50 otherwise.
- *     The "idebus=xx" parameter can be used to override this value.
- *     The actual value to be used is computed/displayed the first time
- *     through. Drivers should only use this as a last resort.
- *
- *     Returns a guessed speed in MHz.
- */
-
-static int ide_system_bus_speed(void)
-{
-#ifdef CONFIG_PCI
-       static struct pci_device_id pci_default[] = {
-               { PCI_DEVICE(PCI_ANY_ID, PCI_ANY_ID) },
-               { }
-       };
-#else
-#define pci_default 0
-#endif /* CONFIG_PCI */
-
-       /* user supplied value */
-       if (idebus_parameter)
-               return idebus_parameter;
-
-       /* safe default value for PCI or VESA and PCI*/
-       return pci_dev_present(pci_default) ? 33 : 50;
-}
-
 void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
 {
        ide_hwgroup_t *hwgroup = hwif->hwgroup;
@@ -540,20 +505,6 @@ static int set_unmaskirq(ide_drive_t *drive, int arg)
        return 0;
 }
 
-/**
- *     system_bus_clock        -       clock guess
- *
- *     External version of the bus clock guess used by very old IDE drivers
- *     for things like VLB timings. Should not be used.
- */
-
-int system_bus_clock (void)
-{
-       return system_bus_speed;
-}
-
-EXPORT_SYMBOL(system_bus_clock);
-
 static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
 {
        ide_drive_t *drive = dev->driver_data;
@@ -851,7 +802,7 @@ static int __init ide_setup(char *s)
        if (strncmp(s,"hd",2) == 0 && s[2] == '=')      /* hd= is for hd.c   */
                return 0;                               /* driver and not us */
 
-       if (strncmp(s,"ide",3) && strncmp(s,"idebus",6) && strncmp(s,"hd",2))
+       if (strncmp(s, "ide", 3) && strncmp(s, "hd", 2))
                return 0;
 
        printk(KERN_INFO "ide_setup: %s", s);
@@ -951,21 +902,6 @@ static int __init ide_setup(char *s)
                }
        }
 
-       if (s[0] != 'i' || s[1] != 'd' || s[2] != 'e')
-               goto bad_option;
-       /*
-        * Look for bus speed option:  "idebus="
-        */
-       if (s[3] == 'b' && s[4] == 'u' && s[5] == 's') {
-               if (match_parm(&s[6], NULL, vals, 1) != 1)
-                       goto bad_option;
-               if (vals[0] >= 20 && vals[0] <= 66) {
-                       idebus_parameter = vals[0];
-               } else
-                       printk(" -- BAD BUS SPEED! Expected value from 20 to 66");
-               goto obsolete_option;
-       }
-
 bad_option:
        printk(" -- BAD OPTION\n");
        return 1;
@@ -1287,11 +1223,6 @@ static int __init ide_init(void)
        int ret;
 
        printk(KERN_INFO "Uniform Multi-Platform E-IDE driver\n");
-       system_bus_speed = ide_system_bus_speed();
-
-       printk(KERN_INFO "ide: Assuming %dMHz system bus speed "
-                        "for PIO modes%s\n", system_bus_speed,
-                       idebus_parameter ? "" : "; override with idebus=xx");
 
        ret = bus_register(&ide_bus_type);
        if (ret < 0) {

diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 90c65cf..052125f 100644 (file)
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -116,7 +116,7 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
        int time1, time2;
        u8 param1, param2, param3, param4;
        unsigned long flags;
-       int bus_speed = ide_vlb_clk ? ide_vlb_clk : system_bus_clock();
+       int bus_speed = ide_vlb_clk ? ide_vlb_clk : 50;
 
        /* calculate timing, according to PIO mode */
        time1 = ide_pio_cycle_time(drive, pio);

diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 4fe516d..dd6dfb3 100644 (file)
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -212,7 +212,7 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio)
 {
        int active_time, recovery_time;
        int active_cycles, recovery_cycles;
-       int bus_speed = ide_vlb_clk ? ide_vlb_clk : system_bus_clock();
+       int bus_speed = ide_vlb_clk ? ide_vlb_clk : 50;
 
         if (pio) {
                unsigned int cycle_time;

diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 6424af1..51dba82 100644 (file)
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -110,7 +110,7 @@ static void qd65xx_select(ide_drive_t *drive)
 
 static u8 qd6500_compute_timing (ide_hwif_t *hwif, int active_time, int recovery_time)
 {
-       int clk = ide_vlb_clk ? ide_vlb_clk : system_bus_clock();
+       int clk = ide_vlb_clk ? ide_vlb_clk : 50;
        u8 act_cyc, rec_cyc;
 
        if (clk <= 33) {
@@ -132,7 +132,7 @@ static u8 qd6500_compute_timing (ide_hwif_t *hwif, int active_time, int recovery
 
 static u8 qd6580_compute_timing (int active_time, int recovery_time)
 {
-       int clk = ide_vlb_clk ? ide_vlb_clk : system_bus_clock();
+       int clk = ide_vlb_clk ? ide_vlb_clk : 50;
        u8 act_cyc, rec_cyc;
 
        act_cyc = 17 - IDE_IN(active_time   * clk / 1000 + 1, 2, 17);

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 7f46c22..ae7a432 100644 (file)
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -140,7 +140,7 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name)
 {
-       int bus_speed = ide_pci_clk ? ide_pci_clk : system_bus_clock();
+       int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
 
        if (bus_speed <= 33)
                pci_set_drvdata(dev, (void *) aec6xxx_33_base);

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index f2129d5..f2de00a 100644 (file)
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -72,7 +72,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
        int s_time, a_time, c_time;
        u8 s_clc, a_clc, r_clc;
        unsigned long flags;
-       int bus_speed = ide_pci_clk ? ide_pci_clk : system_bus_clock();
+       int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
        int port = hwif->channel ? 0x5c : 0x58;
        int portFIFO = hwif->channel ? 0x55 : 0x54;
        u8 cd_dma_fifo = 0;

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index a373101..ad22220 100644 (file)
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -179,7 +179,7 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev,
  * Determine the system bus clock.
  */
 
-       amd_clock = (ide_pci_clk ? ide_pci_clk : system_bus_clock()) * 1000;
+       amd_clock = (ide_pci_clk ? ide_pci_clk : 33) * 1000;
 
        switch (amd_clock) {
                case 33000: amd_clock = 33333; break;

diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index b38a198..cd1ba14 100644 (file)
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -525,12 +525,10 @@ static void cmd640_set_mode(ide_drive_t *drive, unsigned int index,
        u8 setup_count, active_count, recovery_count, recovery_count2, cycle_count;
        int bus_speed;
 
-       if (cmd640_vlb && ide_vlb_clk)
-               bus_speed = ide_vlb_clk;
-       else if (!cmd640_vlb && ide_pci_clk)
-               bus_speed = ide_pci_clk;
+       if (cmd640_vlb)
+               bus_speed = ide_vlb_clk ? ide_vlb_clk : 50;
        else
-               bus_speed = system_bus_clock();
+               bus_speed = ide_pci_clk ? ide_pci_clk : 33;
 
        if (pio_mode > 5)
                pio_mode = 5;

diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 0867471..ca4774a 100644 (file)
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -69,7 +69,7 @@ static u8 quantize_timing(int timing, int quant)
 static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_time)
 {
        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
-       int clock_time = 1000 / (ide_pci_clk ? ide_pci_clk : system_bus_clock());
+       int clock_time = 1000 / (ide_pci_clk ? ide_pci_clk : 33);
        u8  cycle_count, active_count, recovery_count, drwtim;
        static const u8 recovery_values[] =
                {15, 15, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0};
@@ -128,7 +128,7 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
                            ide_pio_timings[pio].active_time);
 
        setup_count = quantize_timing(ide_pio_timings[pio].setup_time,
-                       1000 / (ide_pci_clk ? ide_pci_clk : system_bus_clock()));
+                       1000 / (ide_pci_clk ? ide_pci_clk : 33));
 
        /*
         * The primary channel has individual address setup timing registers

diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 77cc22c..8c534af 100644 (file)
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -134,7 +134,7 @@ static int calc_clk(int time, int bus_speed)
 static void compute_clocks(u8 pio, pio_clocks_t *p_pclk)
 {
        int clk1, clk2;
-       int bus_speed = ide_pci_clk ? ide_pci_clk : system_bus_clock();
+       int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
 
        /* we don't check against CY82C693's min and max speed,
         * so you can play with the idebus=xx parameter

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index e8c2570..3ed9728 100644 (file)
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -340,7 +340,7 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
         * Determine system bus clock.
         */
 
-       via_clock = (ide_pci_clk ? ide_pci_clk : system_bus_clock()) * 1000;
+       via_clock = (ide_pci_clk ? ide_pci_clk : 33) * 1000;
 
        switch (via_clock) {
                case 33000: via_clock = 33333; break;

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 3261c66..dad5356 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -994,8 +994,6 @@ int ide_taskfile_ioctl(ide_drive_t *, unsigned int, unsigned long);
 int ide_cmd_ioctl(ide_drive_t *, unsigned int, unsigned long);
 int ide_task_ioctl(ide_drive_t *, unsigned int, unsigned long);
 
-extern int system_bus_clock(void);
-
 extern int ide_driveid_update(ide_drive_t *);
 extern int ide_config_drive_speed(ide_drive_t *, u8);
 extern u8 eighty_ninty_three (ide_drive_t *);