From 008c81b85905f78112a4bfac13b0f39da2051808 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 15 Jul 2010 13:05:06 +0000 Subject: generic: rtl8366: move switch device to the rtl8366_smi struct SVN-Revision: 22193 --- target/linux/generic/files/drivers/net/phy/rtl8366s.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'target/linux/generic/files/drivers/net/phy/rtl8366s.c') diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c index 4936ceadff..0d1291ad6e 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include "rtl8366_smi.h" @@ -173,7 +172,6 @@ struct rtl8366s { struct device *parent; struct rtl8366_smi smi; - struct switch_dev dev; }; static struct rtl8366_mib_counter rtl8366s_mib_counters[] = { @@ -238,13 +236,8 @@ static inline struct rtl8366s *smi_to_rtl8366s(struct rtl8366_smi *smi) static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw) { - return container_of(sw, struct rtl8366s, dev); -} - -static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw) -{ - struct rtl8366s *rtl = sw_to_rtl8366s(sw); - return &rtl->smi; + struct rtl8366_smi *smi = sw_to_rtl8366_smi(sw); + return smi_to_rtl8366s(smi); } static int rtl8366s_reset_chip(struct rtl8366_smi *smi) @@ -1055,7 +1048,7 @@ static struct switch_dev rtl8366_switch_dev = { static int rtl8366s_switch_init(struct rtl8366s *rtl) { - struct switch_dev *dev = &rtl->dev; + struct switch_dev *dev = &rtl->smi.sw_dev; int err; memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev)); @@ -1071,7 +1064,7 @@ static int rtl8366s_switch_init(struct rtl8366s *rtl) static void rtl8366s_switch_cleanup(struct rtl8366s *rtl) { - unregister_switch(&rtl->dev); + unregister_switch(&rtl->smi.sw_dev); } static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg) -- cgit v1.2.3