diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-28 23:44:38 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-28 23:44:38 +0200 |
| commit | 24cc434acc2b3aaf70eba4ba20890eca5fcfa686 (patch) | |
| tree | 9b5f37b2609190af53547587fb2d43404fdcecd8 /drivers | |
| parent | 165701d9fc0e4e2bf2784119514877484ab361c5 (diff) | |
| download | linux-3.10-24cc434acc2b3aaf70eba4ba20890eca5fcfa686.tar.gz linux-3.10-24cc434acc2b3aaf70eba4ba20890eca5fcfa686.tar.bz2 linux-3.10-24cc434acc2b3aaf70eba4ba20890eca5fcfa686.zip | |
siimage: remove proc_reports_siimage()
* proc_reports_siimage() is now only called by init_chipset_siimage()
so inline it there.
* Use array instead of switch statement for reporting clock modes.
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/pci/siimage.c | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index cf8a7594ba3..590ce7b0f9f 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c @@ -440,30 +440,6 @@ static void sil_sata_pre_reset(ide_drive_t *drive) } /** - * proc_reports_siimage - add siimage controller to proc - * @dev: PCI device - * @clocking: SCSC value - * @name: controller name - * - * Report the clocking mode of the controller and add it to - * the /proc interface layer - */ - -static void proc_reports_siimage (struct pci_dev *dev, u8 clocking, const char *name) -{ - if (!pdev_is_sata(dev)) { - printk(KERN_INFO "%s: BASE CLOCK ", name); - clocking &= 0x03; - switch (clocking) { - case 0x03: printk("DISABLED!\n"); break; - case 0x02: printk("== 2X PCI\n"); break; - case 0x01: printk("== 133\n"); break; - case 0x00: printk("== 100\n"); break; - } - } -} - -/** * setup_mmio_siimage - switch an SI controller into MMIO * @dev: PCI device we are configuring * @name: device name @@ -585,7 +561,14 @@ static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev, const ch writel(0x00680000, ioaddr + 0x1C8); } - proc_reports_siimage(dev, tmp >> 4, name); + /* report the clocking mode of the controller */ + if (!pdev_is_sata(dev)) { + static const char *clk_str[] = + { "== 100", "== 133", "== 2X PCI", "DISABLED!" }; + + tmp >>= 4; + printk(KERN_INFO "%s: BASE CLOCK %s\n", name, clk_str[tmp & 3]); + } return 0; } |