From: Andres Salomon <dilinger@queued.net>
To: Timo von Holtz <tvh@informatik.uni-kiel.de>
Cc: gregkh@suse.de, akpm@linux-foundation.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Staging: olpc_dcon: fixed some coding style issues
Date: Mon, 21 Feb 2011 10:20:55 -0800 [thread overview]
Message-ID: <20110221102055.252cc382@debxo> (raw)
In-Reply-To: <1298296368-3584-1-git-send-email-tvh@informatik.uni-kiel.de>
Hi,
This is still out of date. This should be based on gregkh's staging
tree, or today's next tree. A lot of the stuff that your patch fixes
up has already been removed.
On Mon, 21 Feb 2011 14:52:48 +0100
Timo von Holtz <tvh@informatik.uni-kiel.de> wrote:
> Fixed all coding style issues in the files
> drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
> drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
>
> Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de>
> ---
> drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 2 +-
> drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 51
> +++++++++++++------------- 2 files changed, 26 insertions(+), 27
> deletions(-)
>
> diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
> b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c index 043198d..fab7643
> 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
> +++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
> @@ -152,7 +152,7 @@ static void dcon_wiggle_xo_1(void)
> * According to the cs5536 spec, to set GPIO14 to SMB_CLK we
> must
> * simultaneously set AUX1 IN/OUT to GPIO14; ditto for
> SMB_DATA and
> * GPIO15.
> - */
> + */
> cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_VAL);
> cs5535_gpio_set(OLPC_GPIO_SMB_DATA, GPIO_OUTPUT_VAL);
> cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_ENABLE);
> diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
> b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c index 4f56098..368b838
> 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
> +++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
> @@ -9,10 +9,10 @@
> #include <linux/acpi.h>
>
> /* Hardware setup on the XO 1.5:
> - * DCONLOAD connects to
> + * DCONLOAD connects to
> * VX855_GPO12 (not nCR_PWOFF) (rev A)
> * VX855_GPIO1 (not SMBCK2) (rev B)
> - * DCONBLANK connects to VX855_GPIO8 (not SSPICLK) unused
> in driver
> + * DCONBLANK connects to VX855_GPIO8 (not SSPICLK) unused in
> driver
> * DCONSTAT0 connects to VX855_GPI10 (not SSPISDI)
> * DCONSTAT1 connects to VX855_GPI11 (not nSSPISS)
> * DCONIRQ connects to VX855_GPIO12 (on B3. on B2, it goes to
> @@ -21,11 +21,11 @@
> * DCONSMBCLK connects to VX855 graphics CRTSPCLK
> */
>
> -#define TEST_B2 0 // define to test B3 paths on a modded B2 board
> +#define TEST_B2 0 /* define to test B3 paths on a modded B2 board
> */
> -#define VX855_GENL_PURPOSE_OUTPUT 0x44c // PMIO_Rx4c-4f
> -#define VX855_GPI_STATUS_CHG 0x450 // PMIO_Rx50
> -#define VX855_GPI_SCI_SMI 0x452 // PMIO_Rx52
> +#define VX855_GENL_PURPOSE_OUTPUT 0x44c /* PMIO_Rx4c-4f */
> +#define VX855_GPI_STATUS_CHG 0x450 /* PMIO_Rx50 */
> +#define VX855_GPI_SCI_SMI 0x452 /* PMIO_Rx52 */
> #define BIT_GPIO12 0x40
>
> #define PREFIX "OLPC DCON:"
> @@ -44,7 +44,7 @@ static struct dcon_platform_data dcon_pdata_xo_1_5;
> static void dcon_clear_irq(void)
> {
> if (TEST_B2 ||
> olpc_board_at_least(olpc_board(BOARD_XO_1_5_B3))) {
> - // irq status will appear in PMIO_Rx50[6] (RW1C) on
> gpio12
> + /* irq status will appear in PMIO_Rx50[6] (RW1C) on
> gpio12 */ outb(BIT_GPIO12, VX855_GPI_STATUS_CHG);
> }
> }
> @@ -54,7 +54,7 @@ static int dcon_was_irq(void)
> u_int8_t tmp;
>
> if (TEST_B2 ||
> olpc_board_at_least(olpc_board(BOARD_XO_1_5_B3))) {
> - // irq status will appear in PMIO_Rx50[6] on gpio12
> + /* irq status will appear in PMIO_Rx50[6] on gpio12
> */ tmp = inb(VX855_GPI_STATUS_CHG);
> return !!(tmp & BIT_GPIO12);
> }
> @@ -67,8 +67,8 @@ static int dcon_init_xo_1_5(void)
> unsigned int irq;
> u_int8_t tmp;
> struct pci_dev *pdev;
> -
> -
> +
> +
> pdev = pci_get_device(PCI_VENDOR_ID_VIA,
> PCI_DEVICE_ID_VIA_VX855, NULL);
> if (!pdev) {
> @@ -94,8 +94,8 @@ static int dcon_init_xo_1_5(void)
> pci_write_config_byte(pdev, 0xe4, tmp|0x08);
>
> if (TEST_B2 ||
> olpc_board_at_least(olpc_board(BOARD_XO_1_5_B3))) {
> - // clear PMU_RxE1[6] to select SCI on GPIO12
> - // clear PMU_RxE0[6] to choose falling edge
> + /* clear PMU_RxE1[6] to select SCI on GPIO12 */
> + /* clear PMU_RxE0[6] to choose falling edge */
> pci_read_config_byte(pdev, 0xe1, &tmp);
> pci_write_config_byte(pdev, 0xe1, tmp & ~BIT_GPIO12);
> pci_read_config_byte(pdev, 0xe0, &tmp);
> @@ -103,18 +103,18 @@ static int dcon_init_xo_1_5(void)
>
> dcon_clear_irq();
>
> - // set PMIO_Rx52[6] to enable SCI/SMI on gpio12
> + /* set PMIO_Rx52[6] to enable SCI/SMI on gpio12 */
> outb(inb(VX855_GPI_SCI_SMI)|BIT_GPIO12,
> VX855_GPI_SCI_SMI);
> }
>
> /* Determine the current state of DCONLOAD, likely set by
> firmware */ if (olpc_board_at_least(olpc_board(BOARD_XO_1_5_B1))) {
> - // GPIO1
> + /* GPIO1 */
> dcon_source = (inl(VX855_GENL_PURPOSE_OUTPUT) &
> 0x1000) ? DCON_SOURCE_CPU : DCON_SOURCE_DCON;
> } else {
> - // GPO12
> + /* GPO12 */
> dcon_source = (inl(VX855_GENL_PURPOSE_OUTPUT) &
> 0x04000000) ? DCON_SOURCE_CPU : DCON_SOURCE_DCON;
> }
> @@ -124,7 +124,8 @@ static int dcon_init_xo_1_5(void)
>
> /* we're sharing the IRQ with ACPI */
> irq = acpi_gbl_FADT.sci_interrupt;
> - if (request_irq(irq, &dcon_interrupt, IRQF_SHARED, "DCON",
> &dcon_driver)) {
> + if (request_irq(irq, &dcon_interrupt, IRQF_SHARED,
> + "DCON", &dcon_driver)) {
> printk(KERN_ERR PREFIX "DCON (IRQ%d) allocation
> failed\n", irq); return 1;
> }
> @@ -169,7 +170,7 @@ static void dcon_wiggle_xo_1_5(void)
> * state machine to reset to a (sane) initial state. Mitch
> Bradley
> * did some testing and discovered that holding for 16
> SMB_CLK cycles
> * worked a lot more reliably, so that's what we do here.
> - */
> + */
> set_i2c_line(1, 1);
>
> for (x = 0; x < 16; x++) {
> @@ -180,31 +181,29 @@ static void dcon_wiggle_xo_1_5(void)
> }
> udelay(5);
>
> - if (TEST_B2 ||
> olpc_board_at_least(olpc_board(BOARD_XO_1_5_B3))) {
> - // set PMIO_Rx52[6] to enable SCI/SMI on gpio12
> + if (TEST_B2 ||
> olpc_board_at_least(olpc_board(BOARD_XO_1_5_B3)))
> + /* set PMIO_Rx52[6] to enable SCI/SMI on gpio12 */
> outb(inb(VX855_GPI_SCI_SMI)|BIT_GPIO12,
> VX855_GPI_SCI_SMI);
> - }
> }
>
> static void dcon_set_dconload_xo_1_5(int val)
> {
> - if (olpc_board_at_least(olpc_board(BOARD_XO_1_5_B1))) {
> + if (olpc_board_at_least(olpc_board(BOARD_XO_1_5_B1)))
> gpio_set_value(VX855_GPIO(1), val);
> - } else {
> + else
> gpio_set_value(VX855_GPO(12), val);
> - }
> }
>
> static u8 dcon_read_status_xo_1_5(void)
> {
> u8 status;
> -
> +
> if (!dcon_was_irq())
> return -1;
>
> - // i believe this is the same as "inb(0x44b) & 3"
> + /* i believe this is the same as "inb(0x44b) & 3" */
> status = gpio_get_value(VX855_GPI(10));
> - status |= gpio_get_value(VX855_GPI(11)) << 1;
> + status |= gpio_get_value(VX855_GPI(11)) << 1;
>
> dcon_clear_irq();
>
next prev parent reply other threads:[~2011-02-21 18:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-21 13:52 [PATCH] Staging: olpc_dcon: fixed some coding style issues Timo von Holtz
2011-02-21 18:20 ` Andres Salomon [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-21 19:13 Timo von Holtz
2011-02-21 19:32 ` Andres Salomon
2011-02-13 17:14 Timo von Holtz
2011-02-13 17:45 ` Andres Salomon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110221102055.252cc382@debxo \
--to=dilinger@queued.net \
--cc=akpm@linux-foundation.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=tvh@informatik.uni-kiel.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.