Title: [6033] trunk: Task [#2471], [#4719], add BF518 EZBRD on board KSZ8893M switch driver, fix code style problems.
- Revision
- 6033
- Author
- gyang
- Date
- 2009-01-22 02:12:19 -0600 (Thu, 22 Jan 2009)
Log Message
Task [#2471], [#4719], add BF518 EZBRD on board KSZ8893M switch driver, fix code style problems.
Modified Paths
Diff
Modified: trunk/drivers/net/bfin_mac.c (6032 => 6033)
--- trunk/drivers/net/bfin_mac.c 2009-01-22 08:04:09 UTC (rev 6032)
+++ trunk/drivers/net/bfin_mac.c 2009-01-22 08:12:19 UTC (rev 6033)
@@ -59,10 +59,6 @@
dma_free_coherent(NULL, sizeof(*ptr), ptr, dma_handle)
#endif
-#if defined(CONFIG_NET_DSA_KSZ8893M)
- extern struct dsa_platform_data ksz8893m_switch_data;
-#endif
-
#define PKT_BUF_SZ 1580
#define MAX_TIMEOUT_CNT 500
Modified: trunk/drivers/net/bfin_mac.h (6032 => 6033)
--- trunk/drivers/net/bfin_mac.h 2009-01-22 08:04:09 UTC (rev 6032)
+++ trunk/drivers/net/bfin_mac.h 2009-01-22 08:12:19 UTC (rev 6033)
@@ -70,3 +70,7 @@
};
extern void bfin_get_ether_addr(char *addr);
+
+#if defined(CONFIG_NET_DSA_KSZ8893M)
+ extern struct dsa_platform_data ksz8893m_switch_data;
+#endif
Modified: trunk/net/dsa/ksz8893m.c (6032 => 6033)
--- trunk/net/dsa/ksz8893m.c 2009-01-22 08:04:09 UTC (rev 6032)
+++ trunk/net/dsa/ksz8893m.c 2009-01-22 08:12:19 UTC (rev 6033)
@@ -69,9 +69,8 @@
phyid_high = mdiobus_read(bus, KSZ8893M_CPU_PORT, MII_PHYSID1);
phyid_low = mdiobus_read(bus, KSZ8893M_CPU_PORT, MII_PHYSID2);
- if (phyid_high != PHYID_HIGH || phyid_low != PHYID_LOW) {
+ if (phyid_high != PHYID_HIGH || phyid_low != PHYID_LOW)
return NULL;
- }
switch_read_spi(din, ChipID0, 3);
@@ -94,21 +93,21 @@
/* Set VLAN VID of port1 */
switch_read_spi(din, Port1Control3, 3);
din[2] &= 0xf0;
- dout[2] = (DEFAULT_PORT_VID & 0xfff) >>8 | din[2];
+ dout[2] = (DEFAULT_PORT_VID & 0xfff) >> 8 | din[2];
dout[3] = DEFAULT_PORT_VID & 0xff;
switch_write_spi(dout, Port1Control3, 4);
/* Set VLAN VID of port2 */
switch_read_spi(din, Port2Control3, 3);
din[2] &= 0xf0;
- dout[2] = (DEFAULT_PORT_VID & 0xfff) >>8 | din[2];
+ dout[2] = (DEFAULT_PORT_VID & 0xfff) >> 8 | din[2];
dout[3] = DEFAULT_PORT_VID & 0xff;
switch_write_spi(dout, Port2Control3, 4);
/* Set VLAN VID of port3 */
switch_read_spi(din, Port3Control3, 3);
din[2] &= 0xf0;
- dout[2] = (DEFAULT_PORT_VID & 0xfff) >>8 | din[2];
+ dout[2] = (DEFAULT_PORT_VID & 0xfff) >> 8 | din[2];
dout[3] = DEFAULT_PORT_VID & 0xff;
switch_write_spi(dout, Port3Control3, 4);
@@ -246,12 +245,10 @@
if (val & 0x4000) {
speed = 100;
duplex = 1;
- }
- else if (val & 0x2000) {
+ } else if (val & 0x2000) {
speed = 100;
duplex = 0;
- }
- else if (val & 0x1000 ) {
+ } else if (val & 0x1000) {
speed = 10;
duplex = 1;
}
Modified: trunk/net/dsa/tag_stpid.c (6032 => 6033)
--- trunk/net/dsa/tag_stpid.c 2009-01-22 08:04:09 UTC (rev 6032)
+++ trunk/net/dsa/tag_stpid.c 2009-01-22 08:12:19 UTC (rev 6033)
@@ -74,7 +74,7 @@
(vid != DEFAULT_PORT_VID)) {
u8 new_header[STPID_HLEN];
- /* Convert STPID tag to 802.1q tag */
+ /* Convert STPID tag to 802.1q tag */
new_header[0] = ETH_P_8021QH;
new_header[1] = ETH_P_8021QL;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
