[PATCH 3/3] siimage: remove proc_reports_siimage() - Kernel

This is a discussion on [PATCH 3/3] siimage: remove proc_reports_siimage() - Kernel ; * 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. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/pci/siimage.c | 33 ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: [PATCH 3/3] siimage: remove proc_reports_siimage()

  1. [PATCH 3/3] 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.

    Signed-off-by: Bartlomiej Zolnierkiewicz
    ---
    drivers/ide/pci/siimage.c | 33 ++++++++-------------------------
    1 file changed, 8 insertions(+), 25 deletions(-)

    Index: b/drivers/ide/pci/siimage.c
    ================================================== =================
    --- a/drivers/ide/pci/siimage.c
    +++ b/drivers/ide/pci/siimage.c
    @@ -440,30 +440,6 @@ static void sil_sata_pre_reset(ide_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_chips
    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;
    }
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: [PATCH 3/3] siimage: remove proc_reports_siimage()

    Bartlomiej Zolnierkiewicz wrote:

    > * 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.


    > Signed-off-by: Bartlomiej Zolnierkiewicz


    Acked-by: Sergei Shtylyov

    MBR, Sergei
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread