Commit aee0bda8 authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman

staging: cxt1e1: Fix no spaces at the start of a line in hwprobe.c

clean up checkpatch.pl warnings:
WARNING: please no spaces at the start of a line in
Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37cc9913
...@@ -43,347 +43,348 @@ struct net_device * __init c4_add_dev(hdw_info_t *, int, unsigned long, unsigned ...@@ -43,347 +43,348 @@ struct net_device * __init c4_add_dev(hdw_info_t *, int, unsigned long, unsigned
struct s_hdw_info hdw_info[MAX_BOARDS]; struct s_hdw_info hdw_info[MAX_BOARDS];
void __init void __init
show_two(hdw_info_t *hi, int brdno) show_two(hdw_info_t *hi, int brdno)
{ {
ci_t *ci; ci_t *ci;
struct pci_dev *pdev; struct pci_dev *pdev;
char *bid; char *bid;
char banner[80]; char banner[80];
char sn[6]; char sn[6];
memset(banner, 0, 80); /* clear print buffer */ /* clear print buffer */
memset(banner, 0, 80);
ci = (ci_t *)(netdev_priv(hi->ndev));
bid = sbeid_get_bdname(ci); ci = (ci_t *)(netdev_priv(hi->ndev));
switch (hi->promfmt) bid = sbeid_get_bdname(ci);
{ switch (hi->promfmt)
case PROM_FORMAT_TYPE1: {
memcpy(sn, (FLD_TYPE1 *)(hi->mfg_info.pft1.Serial), 6); case PROM_FORMAT_TYPE1:
break; memcpy(sn, (FLD_TYPE1 *)(hi->mfg_info.pft1.Serial), 6);
case PROM_FORMAT_TYPE2: break;
memcpy(sn, (FLD_TYPE2 *)(hi->mfg_info.pft2.Serial), 6); case PROM_FORMAT_TYPE2:
break; memcpy(sn, (FLD_TYPE2 *)(hi->mfg_info.pft2.Serial), 6);
default: break;
memset(sn, 0, 6); default:
break; memset(sn, 0, 6);
} break;
}
sprintf(banner, "%s: %s S/N %06X, MUSYCC Rev %02X",
hi->devname, bid, sprintf(banner, "%s: %s S/N %06X, MUSYCC Rev %02X",
((sn[3] << 16) & 0xff0000) | hi->devname, bid,
((sn[4] << 8) & 0x00ff00) | ((sn[3] << 16) & 0xff0000) |
(sn[5] & 0x0000ff), ((sn[4] << 8) & 0x00ff00) |
(u_int8_t) hi->revid[0]); (sn[5] & 0x0000ff),
(u_int8_t) hi->revid[0]);
pr_info("%s\n", banner);
pr_info("%s\n", banner);
pdev = hi->pdev[0];
pr_info("%s: %s at v/p=%lx/%lx (%02x:%02x.%x) irq %d\n", pdev = hi->pdev[0];
hi->devname, "MUSYCC", pr_info("%s: %s at v/p=%lx/%lx (%02x:%02x.%x) irq %d\n",
(unsigned long) hi->addr_mapped[0], hi->addr[0], hi->devname, "MUSYCC",
hi->pci_busno, (u_int8_t)PCI_SLOT(pdev->devfn), (unsigned long) hi->addr_mapped[0], hi->addr[0],
(u_int8_t)PCI_FUNC(pdev->devfn), pdev->irq); hi->pci_busno, (u_int8_t) PCI_SLOT(pdev->devfn),
(u_int8_t) PCI_FUNC(pdev->devfn), pdev->irq);
pdev = hi->pdev[1];
pr_info("%s: %s at v/p=%lx/%lx (%02x:%02x.%x) irq %d\n", pdev = hi->pdev[1];
hi->devname, "EBUS ", pr_info("%s: %s at v/p=%lx/%lx (%02x:%02x.%x) irq %d\n",
(unsigned long) hi->addr_mapped[1], hi->addr[1], hi->devname, "EBUS ",
hi->pci_busno, (u_int8_t)PCI_SLOT(pdev->devfn), (unsigned long) hi->addr_mapped[1], hi->addr[1],
(u_int8_t)PCI_FUNC(pdev->devfn), pdev->irq); hi->pci_busno, (u_int8_t) PCI_SLOT(pdev->devfn),
(u_int8_t) PCI_FUNC(pdev->devfn), pdev->irq);
} }
void __init void __init
hdw_sn_get(hdw_info_t *hi, int brdno) hdw_sn_get(hdw_info_t *hi, int brdno)
{ {
/* obtain hardware EEPROM information */ /* obtain hardware EEPROM information */
long addr; long addr;
addr = (long) hi->addr_mapped[1] + EEPROM_OFFSET; addr = (long) hi->addr_mapped[1] + EEPROM_OFFSET;
/* read EEPROM with largest known format size... */ /* read EEPROM with largest known format size... */
pmc_eeprom_read_buffer(addr, 0, (char *)hi->mfg_info.data, sizeof(FLD_TYPE2)); pmc_eeprom_read_buffer(addr, 0, (char *)hi->mfg_info.data, sizeof(FLD_TYPE2));
#if 0 #if 0
{ {
unsigned char *ucp = (unsigned char *) &hi->mfg_info.data; unsigned char *ucp = (unsigned char *) &hi->mfg_info.data;
pr_info("eeprom[00]: %02x %02x %02x %02x %02x %02x %02x %02x\n", pr_info("eeprom[00]: %02x %02x %02x %02x %02x %02x %02x %02x\n",
*(ucp + 0), *(ucp + 1), *(ucp + 2), *(ucp + 3), *(ucp + 4), *(ucp + 5), *(ucp + 6), *(ucp + 7)); *(ucp + 0), *(ucp + 1), *(ucp + 2), *(ucp + 3), *(ucp + 4), *(ucp + 5), *(ucp + 6), *(ucp + 7));
pr_info("eeprom[08]: %02x %02x %02x %02x %02x %02x %02x %02x\n", pr_info("eeprom[08]: %02x %02x %02x %02x %02x %02x %02x %02x\n",
*(ucp + 8), *(ucp + 9), *(ucp + 10), *(ucp + 11), *(ucp + 12), *(ucp + 13), *(ucp + 14), *(ucp + 15)); *(ucp + 8), *(ucp + 9), *(ucp + 10), *(ucp + 11), *(ucp + 12), *(ucp + 13), *(ucp + 14), *(ucp + 15));
pr_info("eeprom[16]: %02x %02x %02x %02x %02x %02x %02x %02x\n", pr_info("eeprom[16]: %02x %02x %02x %02x %02x %02x %02x %02x\n",
*(ucp + 16), *(ucp + 17), *(ucp + 18), *(ucp + 19), *(ucp + 20), *(ucp + 21), *(ucp + 22), *(ucp + 23)); *(ucp + 16), *(ucp + 17), *(ucp + 18), *(ucp + 19), *(ucp + 20), *(ucp + 21), *(ucp + 22), *(ucp + 23));
pr_info("eeprom[24]: %02x %02x %02x %02x %02x %02x %02x %02x\n", pr_info("eeprom[24]: %02x %02x %02x %02x %02x %02x %02x %02x\n",
*(ucp + 24), *(ucp + 25), *(ucp + 26), *(ucp + 27), *(ucp + 28), *(ucp + 29), *(ucp + 30), *(ucp + 31)); *(ucp + 24), *(ucp + 25), *(ucp + 26), *(ucp + 27), *(ucp + 28), *(ucp + 29), *(ucp + 30), *(ucp + 31));
pr_info("eeprom[32]: %02x %02x %02x %02x %02x %02x %02x %02x\n", pr_info("eeprom[32]: %02x %02x %02x %02x %02x %02x %02x %02x\n",
*(ucp + 32), *(ucp + 33), *(ucp + 34), *(ucp + 35), *(ucp + 36), *(ucp + 37), *(ucp + 38), *(ucp + 39)); *(ucp + 32), *(ucp + 33), *(ucp + 34), *(ucp + 35), *(ucp + 36), *(ucp + 37), *(ucp + 38), *(ucp + 39));
pr_info("eeprom[40]: %02x %02x %02x %02x %02x %02x %02x %02x\n", pr_info("eeprom[40]: %02x %02x %02x %02x %02x %02x %02x %02x\n",
*(ucp + 40), *(ucp + 41), *(ucp + 42), *(ucp + 43), *(ucp + 44), *(ucp + 45), *(ucp + 46), *(ucp + 47)); *(ucp + 40), *(ucp + 41), *(ucp + 42), *(ucp + 43), *(ucp + 44), *(ucp + 45), *(ucp + 46), *(ucp + 47));
} }
#endif #endif
#if 0 #if 0
pr_info("sn: %x %x %x %x %x %x\n", pr_info("sn: %x %x %x %x %x %x\n",
hi->mfg_info.Serial[0], hi->mfg_info.Serial[0],
hi->mfg_info.Serial[1], hi->mfg_info.Serial[1],
hi->mfg_info.Serial[2], hi->mfg_info.Serial[2],
hi->mfg_info.Serial[3], hi->mfg_info.Serial[3],
hi->mfg_info.Serial[4], hi->mfg_info.Serial[4],
hi->mfg_info.Serial[5]); hi->mfg_info.Serial[5]);
#endif #endif
if ((hi->promfmt = pmc_verify_cksum(&hi->mfg_info.data)) == PROM_FORMAT_Unk) if ((hi->promfmt = pmc_verify_cksum(&hi->mfg_info.data)) == PROM_FORMAT_Unk)
{ {
/* bad crc, data is suspect */ /* bad crc, data is suspect */
if (cxt1e1_log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
pr_info("%s: EEPROM cksum error\n", hi->devname); pr_info("%s: EEPROM cksum error\n", hi->devname);
hi->mfg_info_sts = EEPROM_CRCERR; hi->mfg_info_sts = EEPROM_CRCERR;
} else } else
hi->mfg_info_sts = EEPROM_OK; hi->mfg_info_sts = EEPROM_OK;
} }
void __init void __init
prep_hdw_info(void) 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;
hi->pci_pin[1] = 0; hi->pci_pin[1] = 0;
hi->ndev = NULL; hi->ndev = NULL;
hi->addr[0] = 0L; hi->addr[0] = 0L;
hi->addr[1] = 0L; hi->addr[1] = 0L;
hi->addr_mapped[0] = 0L; hi->addr_mapped[0] = 0L;
hi->addr_mapped[1] = 0L; hi->addr_mapped[1] = 0L;
} }
} }
void void
cleanup_ioremap(void) 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;
} }
} }
} }
void void
cleanup_devs(void) 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));
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
sbecom_proc_brd_cleanup(netdev_priv(hi->ndev)); sbecom_proc_brd_cleanup(netdev_priv(hi->ndev));
#endif #endif
unregister_netdev(hi->ndev); unregister_netdev(hi->ndev);
free_irq(hi->pdev[0]->irq, hi->ndev); free_irq(hi->pdev[0]->irq, hi->ndev);
#ifdef CONFIG_SBE_PMCC4_NCOMM #ifdef CONFIG_SBE_PMCC4_NCOMM
free_irq(hi->pdev[1]->irq, hi->ndev); free_irq(hi->pdev[1]->irq, hi->ndev);
#endif #endif
OS_kfree(hi->ndev); OS_kfree(hi->ndev);
} }
} }
static int __init static int __init
c4_hdw_init(struct pci_dev *pdev, int found) c4_hdw_init(struct pci_dev *pdev, int found)
{ {
hdw_info_t *hi; hdw_info_t *hi;
int i; int i;
int fun, slot; int fun, slot;
unsigned char busno = 0xff; unsigned char busno = 0xff;
/* our MUSYCC chip supports two functions, 0 & 1 */ /* our MUSYCC chip supports two functions, 0 & 1 */
if ((fun = PCI_FUNC(pdev->devfn)) > 1) if ((fun = PCI_FUNC(pdev->devfn)) > 1)
{ {
pr_warning("unexpected devfun: 0x%x\n", pdev->devfn); pr_warning("unexpected devfun: 0x%x\n", pdev->devfn);
return 0; return 0;
} }
if (pdev->bus) /* obtain bus number */
busno = pdev->bus->number; if (pdev->bus) /* obtain bus number */
else busno = pdev->bus->number;
busno = 0; /* default for system PCI inconsistency */ else
slot = pdev->devfn & ~0x07; busno = 0; /* default for system PCI inconsistency */
slot = pdev->devfn & ~0x07;
/*
* Functions 0 & 1 for a given board (identified by same bus(busno) and /*
* slot(slot)) are placed into the same 'hardware' structure. The first * Functions 0 & 1 for a given board (identified by same bus(busno) and
* part of the board's functionality will be placed into an unpopulated * slot(slot)) are placed into the same 'hardware' structure. The first
* element, identified by "slot==(0xff)". The second part of a board's * part of the board's functionality will be placed into an unpopulated
* functionality will match the previously loaded slot/busno. * element, identified by "slot==(0xff)". The second part of a board's
*/ * 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 first /*
* found * match with board's first found interface, otherwise this is first
*/ * found
if ((hi->pci_slot == 0xff) || /* new board */ */
((hi->pci_slot == slot) && (hi->bus == pdev->bus))) if ((hi->pci_slot == 0xff) || /* new board */
break; /* found for-loop exit */ ((hi->pci_slot == slot) && (hi->bus == pdev->bus)))
} break; /* found for-loop exit */
if (i == MAX_BOARDS) /* no match in above loop means MAX }
* exceeded */ if (i == MAX_BOARDS) /* no match in above loop means MAX
{ * exceeded */
pr_warning("exceeded number of allowed devices (>%d)?\n", MAX_BOARDS); {
return 0; pr_warning("exceeded number of allowed devices (>%d)?\n", MAX_BOARDS);
} return 0;
if (pdev->bus) }
hi->pci_busno = pdev->bus->number; if (pdev->bus)
else hi->pci_busno = pdev->bus->number;
hi->pci_busno = 0; /* default for system PCI inconsistency */ else
hi->pci_slot = slot; hi->pci_busno = 0; /* default for system PCI inconsistency */
pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &hi->pci_pin[fun]); hi->pci_slot = slot;
pci_read_config_byte(pdev, PCI_REVISION_ID, &hi->revid[fun]); pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &hi->pci_pin[fun]);
hi->bus = pdev->bus; pci_read_config_byte(pdev, PCI_REVISION_ID, &hi->revid[fun]);
hi->addr[fun] = pci_resource_start(pdev, 0); hi->bus = pdev->bus;
hi->len[fun] = pci_resource_end(pdev, 0) - hi->addr[fun] + 1; hi->addr[fun] = pci_resource_start(pdev, 0);
hi->pdev[fun] = pdev; hi->len[fun] = pci_resource_end(pdev, 0) - hi->addr[fun] + 1;
hi->pdev[fun] = pdev;
{
/* {
* create device name from module name, plus add the appropriate /*
* board number * create device name from module name, plus add the appropriate
*/ * board number
char *cp = hi->devname; */
char *cp = hi->devname;
strcpy(cp, KBUILD_MODNAME);
cp += strlen(cp); /* reposition */ strcpy(cp, KBUILD_MODNAME);
*cp++ = '-'; cp += strlen(cp); /* reposition */
*cp++ = '0' + (found / 2); /* there are two found interfaces per *cp++ = '-';
* board */ *cp++ = '0' + (found / 2); /* there are two found interfaces per
*cp = 0; /* termination */ * board */
} *cp = 0; /* termination */
}
return 1;
return 1;
} }
status_t __init
status_t __init
c4hw_attach_all(void) c4hw_attach_all(void)
{ {
hdw_info_t *hi; hdw_info_t *hi;
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
int found = 0, i, j; int found = 0, i, j;
error_flag = 0; error_flag = 0;
prep_hdw_info(); prep_hdw_info();
/*** 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();
return -ENOMEM; return -ENOMEM;
} }
#ifdef SBE_MAP_DEBUG #ifdef SBE_MAP_DEBUG
pr_warning("%s: io remapped from phys %x to virt %x\n", pr_warning("%s: io remapped from phys %x to virt %x\n",
hi->devname, (u_int32_t) hi->addr[j], (u_int32_t) hi->addr_mapped[j]); hi->devname, (u_int32_t) hi->addr[j], (u_int32_t) hi->addr_mapped[j]);
#endif #endif
} }
} }
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);
cleanup_devs(); cleanup_devs();
cleanup_ioremap(); cleanup_ioremap();
return -EIO; return -EIO;
} }
pci_set_master(hi->pdev[0]); pci_set_master(hi->pdev[0]);
pci_set_master(hi->pdev[1]); pci_set_master(hi->pdev[1]);
if (!(hi->ndev = c4_add_dev(hi, i, (long) hi->addr_mapped[0], if (!(hi->ndev = c4_add_dev(hi, i, (long) hi->addr_mapped[0],
(long) hi->addr_mapped[1], (long) hi->addr_mapped[1],
hi->pdev[0]->irq, hi->pdev[0]->irq,
hi->pdev[1]->irq))) hi->pdev[1]->irq)))
{ {
drvr_state = SBE_DRVR_DOWN; drvr_state = SBE_DRVR_DOWN;
cleanup_ioremap(); cleanup_ioremap();
/* NOTE: c4_add_dev() does its own device cleanup */ /* NOTE: c4_add_dev() does its own device cleanup */
#if 0 #if 0
cleanup_devs(); cleanup_devs();
#endif #endif
return error_flag; /* error_flag set w/in add_dev() */ return error_flag; /* error_flag set w/in add_dev() */
} }
show_two(hi, i); /* displays found information */ show_two(hi, i); /* displays found information */
} }
return 0; return 0;
} }
/*** End-of-File ***/ /*** End-of-File ***/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment