Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755714Ab1BUSVJ (ORCPT ); Mon, 21 Feb 2011 13:21:09 -0500 Received: from LUNGE.MIT.EDU ([18.54.1.69]:54573 "EHLO lunge.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753852Ab1BUSVG (ORCPT ); Mon, 21 Feb 2011 13:21:06 -0500 Date: Mon, 21 Feb 2011 10:20:55 -0800 From: Andres Salomon To: Timo von Holtz 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 Message-ID: <20110221102055.252cc382@debxo> In-Reply-To: <1298296368-3584-1-git-send-email-tvh@informatik.uni-kiel.de> References: <1298296368-3584-1-git-send-email-tvh@informatik.uni-kiel.de> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7034 Lines: 207 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 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 > --- > 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 > > /* 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(); > -- 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/