UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: olpc_dcon: fix space and coding issues 

Fix the whitespace and coding style issues in olpc_dcon metioned by
checkpatch.

Signed-off-by: Stefan Brähler <Stefan.Braehler@gmail.com>
Acked-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Stefan Brähler 2011-04-12 19:53:31 +02:00 committed by Greg Kroah-Hartman
parent c09c9ae0a8
commit a3712f4987
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
View File

@ -152,7 +152,7 @@ static void dcon_wiggle_xo_1(void)
* According to the cs5536 spec, to set GPIO14 to SMB_CLK we must * 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 * simultaneously set AUX1 IN/OUT to GPIO14; ditto for SMB_DATA and
* GPIO15. * GPIO15.
*/ */
cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_VAL); 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_DATA, GPIO_OUTPUT_VAL);
cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_ENABLE); cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_ENABLE);

22
drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
View File

@ -24,9 +24,8 @@
#include "olpc_dcon.h" #include "olpc_dcon.h"
/* Hardware setup on the XO 1.5: /* Hardware setup on the XO 1.5:
* DCONLOAD connects to * DCONLOAD connects to VX855_GPIO1 (not SMBCK2)
* VX855_GPIO1 (not SMBCK2) * 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) * DCONSTAT0 connects to VX855_GPI10 (not SSPISDI)
* DCONSTAT1 connects to VX855_GPI11 (not nSSPISS) * DCONSTAT1 connects to VX855_GPI11 (not nSSPISS)
* DCONIRQ connects to VX855_GPIO12 * DCONIRQ connects to VX855_GPIO12
@ -34,9 +33,9 @@
* DCONSMBCLK connects to VX855 graphics CRTSPCLK * DCONSMBCLK connects to VX855 graphics CRTSPCLK
*/ */
#define VX855_GENL_PURPOSE_OUTPUT 0x44c // PMIO_Rx4c-4f #define VX855_GENL_PURPOSE_OUTPUT 0x44c /* PMIO_Rx4c-4f */
#define VX855_GPI_STATUS_CHG 0x450 // PMIO_Rx50 #define VX855_GPI_STATUS_CHG 0x450 /* PMIO_Rx50 */
#define VX855_GPI_SCI_SMI 0x452 // PMIO_Rx52 #define VX855_GPI_SCI_SMI 0x452 /* PMIO_Rx52 */
#define BIT_GPIO12 0x40 #define BIT_GPIO12 0x40
#define PREFIX "OLPC DCON:" #define PREFIX "OLPC DCON:"
@ -63,8 +62,7 @@ static int dcon_init_xo_1_5(struct dcon_priv *dcon)
unsigned int irq; unsigned int irq;
u_int8_t tmp; u_int8_t tmp;
struct pci_dev *pdev; struct pci_dev *pdev;
pdev = pci_get_device(PCI_VENDOR_ID_VIA, pdev = pci_get_device(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VX855, NULL); PCI_DEVICE_ID_VIA_VX855, NULL);
if (!pdev) { if (!pdev) {
@ -149,7 +147,7 @@ static void dcon_wiggle_xo_1_5(void)
* state machine to reset to a (sane) initial state. Mitch Bradley * state machine to reset to a (sane) initial state. Mitch Bradley
* did some testing and discovered that holding for 16 SMB_CLK cycles * did some testing and discovered that holding for 16 SMB_CLK cycles
* worked a lot more reliably, so that's what we do here. * worked a lot more reliably, so that's what we do here.
*/ */
set_i2c_line(1, 1); set_i2c_line(1, 1);
for (x = 0; x < 16; x++) { for (x = 0; x < 16; x++) {
@ -172,13 +170,13 @@ static void dcon_set_dconload_xo_1_5(int val)
static u8 dcon_read_status_xo_1_5(void) static u8 dcon_read_status_xo_1_5(void)
{ {
u8 status; u8 status;
if (!dcon_was_irq()) if (!dcon_was_irq())
return -1; 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(10));
status |= gpio_get_value(VX855_GPI(11)) << 1; status |= gpio_get_value(VX855_GPI(11)) << 1;
dcon_clear_irq(); dcon_clear_irq();