Commit b50e2964 authored by Bongsu Jeon's avatar Bongsu Jeon Committed by Jakub Kicinski
parent aa8f2cbd
...@@ -136,7 +136,7 @@ static struct nci_ops s3fwrn5_nci_ops = { ...@@ -136,7 +136,7 @@ static struct nci_ops s3fwrn5_nci_ops = {
}; };
int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev, int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev,
const struct s3fwrn5_phy_ops *phy_ops, unsigned int max_payload) const struct s3fwrn5_phy_ops *phy_ops)
{ {
struct s3fwrn5_info *info; struct s3fwrn5_info *info;
int ret; int ret;
...@@ -148,7 +148,6 @@ int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev, ...@@ -148,7 +148,6 @@ int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev,
info->phy_id = phy_id; info->phy_id = phy_id;
info->pdev = pdev; info->pdev = pdev;
info->phy_ops = phy_ops; info->phy_ops = phy_ops;
info->max_payload = max_payload;
mutex_init(&info->mutex); mutex_init(&info->mutex);
s3fwrn5_set_mode(info, S3FWRN5_MODE_COLD); s3fwrn5_set_mode(info, S3FWRN5_MODE_COLD);
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#define S3FWRN5_I2C_DRIVER_NAME "s3fwrn5_i2c" #define S3FWRN5_I2C_DRIVER_NAME "s3fwrn5_i2c"
#define S3FWRN5_I2C_MAX_PAYLOAD 32
#define S3FWRN5_EN_WAIT_TIME 150 #define S3FWRN5_EN_WAIT_TIME 150
struct s3fwrn5_i2c_phy { struct s3fwrn5_i2c_phy {
...@@ -248,8 +247,7 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client, ...@@ -248,8 +247,7 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = s3fwrn5_probe(&phy->ndev, phy, &phy->i2c_dev->dev, &i2c_phy_ops, ret = s3fwrn5_probe(&phy->ndev, phy, &phy->i2c_dev->dev, &i2c_phy_ops);
S3FWRN5_I2C_MAX_PAYLOAD);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -34,7 +34,6 @@ struct s3fwrn5_info { ...@@ -34,7 +34,6 @@ struct s3fwrn5_info {
struct device *pdev; struct device *pdev;
const struct s3fwrn5_phy_ops *phy_ops; const struct s3fwrn5_phy_ops *phy_ops;
unsigned int max_payload;
struct s3fwrn5_fw_info fw_info; struct s3fwrn5_fw_info fw_info;
...@@ -79,7 +78,7 @@ static inline int s3fwrn5_write(struct s3fwrn5_info *info, struct sk_buff *skb) ...@@ -79,7 +78,7 @@ static inline int s3fwrn5_write(struct s3fwrn5_info *info, struct sk_buff *skb)
} }
int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev, int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev,
const struct s3fwrn5_phy_ops *phy_ops, unsigned int max_payload); const struct s3fwrn5_phy_ops *phy_ops);
void s3fwrn5_remove(struct nci_dev *ndev); void s3fwrn5_remove(struct nci_dev *ndev);
int s3fwrn5_recv_frame(struct nci_dev *ndev, struct sk_buff *skb, int s3fwrn5_recv_frame(struct nci_dev *ndev, struct sk_buff *skb,
......
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