Symbol rtl8366_enable_vlan and rtl8366_reset_vlan are also present in
the DSA driver upstream and conflicts as they are EXPORTED.
Rename them to rtl8366_smi_enable_vlan and rtl8366_smi_reset_vlan to fix
the conflict. While at it also make them static and drop the
EXPORT_SYMBOL_GPL as they are not actually used by any other driver and
exporting them is useless.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
-int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
+static int rtl8366_smi_enable_vlan(struct rtl8366_smi *smi, int enable)
-EXPORT_SYMBOL_GPL(rtl8366_enable_vlan);
-static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
+static int rtl8366_smi_enable_vlan4k(struct rtl8366_smi *smi, int enable)
-int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable)
+static int rtl8366_smi_enable_all_ports(struct rtl8366_smi *smi, int enable)
-EXPORT_SYMBOL_GPL(rtl8366_enable_all_ports);
-int rtl8366_reset_vlan(struct rtl8366_smi *smi)
+static int rtl8366_smi_reset_vlan(struct rtl8366_smi *smi)
{
struct rtl8366_vlan_mc vlanmc;
int err;
int i;
{
struct rtl8366_vlan_mc vlanmc;
int err;
int i;
- rtl8366_enable_vlan(smi, 0);
- rtl8366_enable_vlan4k(smi, 0);
+ rtl8366_smi_enable_vlan(smi, 0);
+ rtl8366_smi_enable_vlan4k(smi, 0);
/* clear VLAN member configurations */
vlanmc.vid = 0;
/* clear VLAN member configurations */
vlanmc.vid = 0;
-EXPORT_SYMBOL_GPL(rtl8366_reset_vlan);
static int rtl8366_init_vlan(struct rtl8366_smi *smi)
{
int port;
int err;
static int rtl8366_init_vlan(struct rtl8366_smi *smi)
{
int port;
int err;
- err = rtl8366_reset_vlan(smi);
+ err = rtl8366_smi_reset_vlan(smi);
- return rtl8366_enable_vlan(smi, 1);
+ return rtl8366_smi_enable_vlan(smi, 1);
}
#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
}
#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
- err = rtl8366_reset_vlan(smi);
+ err = rtl8366_smi_reset_vlan(smi);
- err = rtl8366_enable_vlan(smi, 1);
+ err = rtl8366_smi_enable_vlan(smi, 1);
- return rtl8366_enable_all_ports(smi, 1);
+ return rtl8366_smi_enable_all_ports(smi, 1);
}
EXPORT_SYMBOL_GPL(rtl8366_sw_reset_switch);
}
EXPORT_SYMBOL_GPL(rtl8366_sw_reset_switch);
return -EINVAL;
if (attr->ofs == 1)
return -EINVAL;
if (attr->ofs == 1)
- err = rtl8366_enable_vlan(smi, val->value.i);
+ err = rtl8366_smi_enable_vlan(smi, val->value.i);
- err = rtl8366_enable_vlan4k(smi, val->value.i);
+ err = rtl8366_smi_enable_vlan4k(smi, val->value.i);
- err = rtl8366_enable_all_ports(smi, 1);
+ err = rtl8366_smi_enable_all_ports(smi, 1);
if (err)
goto err_free_sck;
if (err)
goto err_free_sck;
int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data);
int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data);
int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data);
int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data);
-int rtl8366_reset_vlan(struct rtl8366_smi *smi);
-int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable);
-int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable);
-
#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
int rtl8366_debugfs_open(struct inode *inode, struct file *file);
#endif
#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
int rtl8366_debugfs_open(struct inode *inode, struct file *file);
#endif