Commit 49750221 authored by Jeff Garzik's avatar Jeff Garzik

[netdrvr sis190] manually clean up formatting a bit more

Also, two trivial code changes:
* add unlikely() to assert() definition
* fix MODULE_AUTHOR email address brackets
parent 3c51f78e
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#ifdef SiS190_DEBUG #ifdef SiS190_DEBUG
#define assert(expr) \ #define assert(expr) \
if(!(expr)) { \ if(unlikely(!(expr))) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n", \ printk( "Assertion failed! %s,%s,%s,line=%d\n", \
#expr,__FILE__,__FUNCTION__,__LINE__); \ #expr,__FILE__,__FUNCTION__,__LINE__); \
} }
...@@ -137,18 +137,17 @@ static int multicast_filter_limit = 32; ...@@ -137,18 +137,17 @@ static int multicast_filter_limit = 32;
static struct { static struct {
const char *name; const char *name;
} board_info[] __devinitdata = { } board_info[] __devinitdata = {
{ { "SiS190 Gigabit Ethernet" },
"SiS190 Gigabit Ethernet"},}; };
static struct pci_device_id sis190_pci_tbl[] __devinitdata = { static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
{0x1039, 0x0190, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0x1039, 0x0190, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{0,}, { 0,},
}; };
MODULE_DEVICE_TABLE(pci, sis190_pci_tbl); MODULE_DEVICE_TABLE(pci, sis190_pci_tbl);
enum SiS190_registers { enum SiS190_registers {
TxControl = 0x0, TxControl = 0x0,
TxDescStartAddr = 0x4, TxDescStartAddr = 0x4,
TxNextDescAddr = 0x0c, TxNextDescAddr = 0x0c,
...@@ -277,8 +276,8 @@ const static struct { ...@@ -277,8 +276,8 @@ const static struct {
u8 version; /* depend on docs */ u8 version; /* depend on docs */
u32 RxConfigMask; /* should clear the bits supported by this chip */ u32 RxConfigMask; /* should clear the bits supported by this chip */
} sis_chip_info[] = { } sis_chip_info[] = {
{ { "SiS-0190", 0x00, 0xff7e1880,},
"SiS-0190", 0x00, 0xff7e1880,},}; };
enum _DescStatusBit { enum _DescStatusBit {
OWNbit = 0x80000000, OWNbit = 0x80000000,
...@@ -321,7 +320,7 @@ struct sis190_private { ...@@ -321,7 +320,7 @@ struct sis190_private {
struct sk_buff *Tx_skbuff[NUM_TX_DESC]; /* Index of Transmit data buffer */ struct sk_buff *Tx_skbuff[NUM_TX_DESC]; /* Index of Transmit data buffer */
}; };
MODULE_AUTHOR("K.M. Liu<kmliu@sis.com"); MODULE_AUTHOR("K.M. Liu <kmliu@sis.com>");
MODULE_DESCRIPTION("SiS SiS190 Gigabit Ethernet driver"); MODULE_DESCRIPTION("SiS SiS190 Gigabit Ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_PARM(media, "1-" __MODULE_STRING(MAX_UNITS) "i"); MODULE_PARM(media, "1-" __MODULE_STRING(MAX_UNITS) "i");
...@@ -513,10 +512,10 @@ SiS190_init_board(struct pci_dev *pdev, struct net_device **dev_out, ...@@ -513,10 +512,10 @@ SiS190_init_board(struct pci_dev *pdev, struct net_device **dev_out,
*dev_out = dev; *dev_out = dev;
return 0; return 0;
err_out_free_res: err_out_free_res:
pci_release_regions(pdev); pci_release_regions(pdev);
err_out: err_out:
pci_disable_device(pdev); pci_disable_device(pdev);
unregister_netdev(dev); unregister_netdev(dev);
kfree(dev); kfree(dev);
...@@ -1177,8 +1176,6 @@ static struct pci_driver sis190_pci_driver = { ...@@ -1177,8 +1176,6 @@ static struct pci_driver sis190_pci_driver = {
.id_table = sis190_pci_tbl, .id_table = sis190_pci_tbl,
.probe = SiS190_init_one, .probe = SiS190_init_one,
.remove = SiS190_remove_one, .remove = SiS190_remove_one,
.suspend = NULL,
.resume = NULL,
}; };
static int __init static int __init
......
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