X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Ffiles%2Fdrivers%2Fnet%2Fphy%2Fip175c.c;h=b780f865611cf96ed7ffe6bc9c6d534faab66a7c;hb=109963bd6dc409df7ffae50964326dfa128429e4;hp=673ff127639768a95479339a03a99692b5547f11;hpb=dfce366310e819bb44279f0125c47f7647cbe279;p=openwrt-10.03%2F.git

diff --git a/target/linux/generic-2.6/files/drivers/net/phy/ip175c.c b/target/linux/generic-2.6/files/drivers/net/phy/ip175c.c
index 673ff1276..b780f8656 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/ip175c.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/ip175c.c
@@ -801,7 +801,7 @@ static int ip175c_apply(struct switch_dev *dev)
 	return 0;
 }
 
-static int ip175c_reset(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+static int ip175c_reset(struct switch_dev *dev)
 {
 	struct ip175c_state *state = dev->priv;
 	int i, err;
@@ -1115,7 +1115,6 @@ enum Ports {
 };
 
 enum Globals {
-	IP175C_RESET,
 	IP175C_ENABLE_VLAN,
 	IP175C_GET_NAME,
 	IP175C_REGISTER_PHY,
@@ -1125,14 +1124,6 @@ enum Globals {
 };
 
 static const struct switch_attr ip175c_global[] = {
-	[IP175C_RESET] = {
-		.id = IP175C_RESET,
-		.type = SWITCH_TYPE_NOVAL,
-		.name  = "reset",
-		.get = NULL,
-		.description = "Resets the switch but does not clear vlan configuration",
-		.set = ip175c_reset,
-	},
 	[IP175C_ENABLE_VLAN] = {
 		.id = IP175C_ENABLE_VLAN,
 		.type = SWITCH_TYPE_INT,
@@ -1233,6 +1224,7 @@ static int ip175c_probe(struct phy_device *pdev)
 	dev->get_vlan_ports = ip175c_get_ports;
 	dev->set_vlan_ports = ip175c_set_ports;
 	dev->apply_config = ip175c_apply;
+	dev->reset_switch = ip175c_reset;
 
 	dev->priv = state;
 	pdev->priv = state;
@@ -1265,7 +1257,7 @@ static int ip175c_config_init(struct phy_device *pdev)
 	if (err < 0)
 		return err;
 
-	ip175c_reset(&state->dev, NULL, NULL);
+	ip175c_reset(&state->dev);
 
 	state->registered = true;
 	netif_carrier_on(pdev->attached_dev);