leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: cxt1e1: fix checkpatch errors with open brace '{'

Browse Source 
clean up checkpatch.pl error:
 ERROR: that open brace { should be on the previous line

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daeseok Youn 2014-03-03 09:00:57 +09:00 committed by Greg Kroah-Hartman
parent 418af0dc20
commit 53261926fb
1 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/staging/cxt1e1/hwprobe.c
View File

@ -58,8 +58,7 @@ show_two(hdw_info_t *hi, int brdno)
ci = (ci_t *)(netdev_priv(hi->ndev)); ci = (ci_t *)(netdev_priv(hi->ndev));
bid = sbeid_get_bdname(ci); bid = sbeid_get_bdname(ci);
switch (hi->promfmt) switch (hi->promfmt) {
{
case PROM_FORMAT_TYPE1: case PROM_FORMAT_TYPE1:
memcpy(sn, (FLD_TYPE1 *)(hi->mfg_info.pft1.Serial), 6); memcpy(sn, (FLD_TYPE1 *)(hi->mfg_info.pft1.Serial), 6);
break; break;
@ -159,8 +158,7 @@ prep_hdw_info(void)
hdw_info_t *hi; hdw_info_t *hi;
int i; int i;
for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) {
{
hi->pci_busno = 0xff; hi->pci_busno = 0xff;
hi->pci_slot = 0xff; hi->pci_slot = 0xff;
hi->pci_pin[0] = 0; hi->pci_pin[0] = 0;
@ -179,18 +177,15 @@ cleanup_ioremap(void)
hdw_info_t *hi; hdw_info_t *hi;
int i; int i;
for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) {
{
if (hi->pci_slot == 0xff) if (hi->pci_slot == 0xff)
break; break;
if (hi->addr_mapped[0]) if (hi->addr_mapped[0]) {
{
iounmap((void *)(hi->addr_mapped[0])); iounmap((void *)(hi->addr_mapped[0]));
release_mem_region((long) hi->addr[0], hi->len[0]); release_mem_region((long) hi->addr[0], hi->len[0]);
hi->addr_mapped[0] = 0; hi->addr_mapped[0] = 0;
} }
if (hi->addr_mapped[1]) if (hi->addr_mapped[1]) {
{
iounmap((void *)(hi->addr_mapped[1])); iounmap((void *)(hi->addr_mapped[1]));
release_mem_region((long) hi->addr[1], hi->len[1]); release_mem_region((long) hi->addr[1], hi->len[1]);
hi->addr_mapped[1] = 0; hi->addr_mapped[1] = 0;
@ -205,8 +200,7 @@ cleanup_devs(void)
hdw_info_t *hi; hdw_info_t *hi;
int i; int i;
for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) {
{
if (hi->pci_slot == 0xff || !hi->ndev) if (hi->pci_slot == 0xff || !hi->ndev)
break; break;
c4_stopwd(netdev_priv(hi->ndev)); c4_stopwd(netdev_priv(hi->ndev));
@ -252,8 +246,7 @@ c4_hdw_init(struct pci_dev *pdev, int found)
* element, identified by "slot==(0xff)". The second part of a board's * element, identified by "slot==(0xff)". The second part of a board's
* functionality will match the previously loaded slot/busno. * functionality will match the previously loaded slot/busno.
*/ */
for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) {
{
/* /*
* match with board's first found interface, otherwise this is * match with board's first found interface, otherwise this is
* fisrt found * fisrt found
@ -262,17 +255,19 @@ c4_hdw_init(struct pci_dev *pdev, int found)
((hi->pci_slot == slot) && (hi->bus == pdev->bus))) ((hi->pci_slot == slot) && (hi->bus == pdev->bus)))
break; /* found for-loop exit */ break; /* found for-loop exit */
} }
if (i == MAX_BOARDS) /* no match in above loop means MAX
* exceeded */ /* no match in above loop means MAX exceeded */
{ if (i == MAX_BOARDS) {
pr_warning("exceeded number of allowed devices (>%d)?\n", pr_warning("exceeded number of allowed devices (>%d)?\n",
MAX_BOARDS); MAX_BOARDS);
return 0; return 0;
} }
if (pdev->bus) if (pdev->bus)
hi->pci_busno = pdev->bus->number; hi->pci_busno = pdev->bus->number;
else else
hi->pci_busno = 0; /* default for system PCI inconsistency */ hi->pci_busno = 0; /* default for system PCI inconsistency */
hi->pci_slot = slot; hi->pci_slot = slot;
pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &hi->pci_pin[fun]); pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &hi->pci_pin[fun]);
pci_read_config_byte(pdev, PCI_REVISION_ID, &hi->revid[fun]); pci_read_config_byte(pdev, PCI_REVISION_ID, &hi->revid[fun]);
@ -311,43 +306,38 @@ c4hw_attach_all(void)
/*** scan PCI bus for all possible boards */ /*** scan PCI bus for all possible boards */
while ((pdev = pci_get_device(PCI_VENDOR_ID_CONEXANT, while ((pdev = pci_get_device(PCI_VENDOR_ID_CONEXANT,
PCI_DEVICE_ID_CN8474, PCI_DEVICE_ID_CN8474,
pdev))) pdev))) {
{
if (c4_hdw_init(pdev, found)) if (c4_hdw_init(pdev, found))
found++; found++;
} }
if (!found)
{ if (!found) {
pr_warning("No boards found\n"); pr_warning("No boards found\n");
return -ENODEV; return -ENODEV;
} }
/* sanity check for consistent hardware found */ /* sanity check for consistent hardware found */
for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) {
{ if (hi->pci_slot != 0xff && (!hi->addr[0] || !hi->addr[1])) {
if (hi->pci_slot != 0xff && (!hi->addr[0] || !hi->addr[1]))
{
pr_warning("%s: something very wrong with pci_get_device\n", pr_warning("%s: something very wrong with pci_get_device\n",
hi->devname); hi->devname);
return -EIO; return -EIO;
} }
} }
/* bring board's memory regions on/line */ /* bring board's memory regions on/line */
for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) {
{
if (hi->pci_slot == 0xff) if (hi->pci_slot == 0xff)
break; break;
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++) {
{ if (!request_mem_region(hi->addr[j], hi->len[j], hi->devname)) {
if (!request_mem_region(hi->addr[j], hi->len[j], hi->devname))
{
pr_warning("%s: memory in use, addr=0x%lx, len=0x%lx ?\n", pr_warning("%s: memory in use, addr=0x%lx, len=0x%lx ?\n",
hi->devname, hi->addr[j], hi->len[j]); hi->devname, hi->addr[j], hi->len[j]);
cleanup_ioremap(); cleanup_ioremap();
return -ENOMEM; return -ENOMEM;
} }
hi->addr_mapped[j] = (unsigned long)ioremap(hi->addr[j], hi->len[j]); hi->addr_mapped[j] = (unsigned long)ioremap(hi->addr[j], hi->len[j]);
if (!hi->addr_mapped[j]) if (!hi->addr_mapped[j]) {
{
pr_warning("%s: ioremap fails, addr=0x%lx, len=0x%lx ?\n", pr_warning("%s: ioremap fails, addr=0x%lx, len=0x%lx ?\n",
hi->devname, hi->addr[j], hi->len[j]); hi->devname, hi->addr[j], hi->len[j]);
cleanup_ioremap(); cleanup_ioremap();
@ -364,13 +354,11 @@ c4hw_attach_all(void)
drvr_state = SBE_DRVR_AVAILABLE; drvr_state = SBE_DRVR_AVAILABLE;
/* Have now memory mapped all boards. Now allow board's access to system */ /* Have now memory mapped all boards. Now allow board's access to system */
for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) for (i = 0, hi = hdw_info; i < MAX_BOARDS; i++, hi++) {
{
if (hi->pci_slot == 0xff) if (hi->pci_slot == 0xff)
break; break;
if (pci_enable_device(hi->pdev[0]) || if (pci_enable_device(hi->pdev[0]) ||
pci_enable_device(hi->pdev[1])) pci_enable_device(hi->pdev[1])) {
{
drvr_state = SBE_DRVR_DOWN; drvr_state = SBE_DRVR_DOWN;
pr_warning("%s: failed to enable card %d slot %d\n", pr_warning("%s: failed to enable card %d slot %d\n",
hi->devname, i, hi->pci_slot); hi->devname, i, hi->pci_slot);