staging: rtl8723bs: Remove File operation APIs
rtl8723bs had 2 private file operation helpers: rtw_is_file_readable() rtw_retrive_from_file() These were only used by the removed phy_Config*WithParaFile() functions, so they can be removed now. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20191009123223.163241-5-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
44bcfb27d2
commit
38c077d707
|
@ -171,10 +171,6 @@ extern void rtw_softap_lock_suspend(void);
|
|||
extern void rtw_softap_unlock_suspend(void);
|
||||
#endif
|
||||
|
||||
/* File operation APIs, just for linux now */
|
||||
extern int rtw_is_file_readable(char *path);
|
||||
extern int rtw_retrive_from_file(char *path, u8 *buf, u32 sz);
|
||||
|
||||
extern void rtw_free_netdev(struct net_device * netdev);
|
||||
|
||||
|
||||
|
|
|
@ -65,142 +65,6 @@ void _rtw_init_queue(struct __queue *pqueue)
|
|||
spin_lock_init(&(pqueue->lock));
|
||||
}
|
||||
|
||||
/*
|
||||
* Open a file with the specific @param path, @param flag, @param mode
|
||||
* @param fpp the pointer of struct file pointer to get struct file pointer while file opening is success
|
||||
* @param path the path of the file to open
|
||||
* @param flag file operation flags, please refer to linux document
|
||||
* @param mode please refer to linux document
|
||||
* @return Linux specific error code
|
||||
*/
|
||||
static int openFile(struct file **fpp, char *path, int flag, int mode)
|
||||
{
|
||||
struct file *fp;
|
||||
|
||||
fp = filp_open(path, flag, mode);
|
||||
if (IS_ERR(fp)) {
|
||||
*fpp = NULL;
|
||||
return PTR_ERR(fp);
|
||||
}
|
||||
else {
|
||||
*fpp = fp;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Close the file with the specific @param fp
|
||||
* @param fp the pointer of struct file to close
|
||||
* @return always 0
|
||||
*/
|
||||
static int closeFile(struct file *fp)
|
||||
{
|
||||
filp_close(fp, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int readFile(struct file *fp, char *buf, int len)
|
||||
{
|
||||
int rlen = 0, sum = 0;
|
||||
|
||||
if (!fp->f_op || !fp->f_op->read)
|
||||
return -EPERM;
|
||||
|
||||
while (sum < len) {
|
||||
rlen = kernel_read(fp, buf + sum, len - sum, &fp->f_pos);
|
||||
if (rlen > 0)
|
||||
sum += rlen;
|
||||
else if (0 != rlen)
|
||||
return rlen;
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
return sum;
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* Test if the specifi @param path is a file and readable
|
||||
* @param path the path of the file to test
|
||||
* @return Linux specific error code
|
||||
*/
|
||||
static int isFileReadable(char *path)
|
||||
{
|
||||
struct file *fp;
|
||||
int ret = 0;
|
||||
char buf;
|
||||
|
||||
fp = filp_open(path, O_RDONLY, 0);
|
||||
if (IS_ERR(fp))
|
||||
return PTR_ERR(fp);
|
||||
|
||||
if (readFile(fp, &buf, 1) != 1)
|
||||
ret = -EINVAL;
|
||||
|
||||
filp_close(fp, NULL);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Open the file with @param path and retrive the file content into memory starting from @param buf for @param sz at most
|
||||
* @param path the path of the file to open and read
|
||||
* @param buf the starting address of the buffer to store file content
|
||||
* @param sz how many bytes to read at most
|
||||
* @return the byte we've read, or Linux specific error code
|
||||
*/
|
||||
static int retriveFromFile(char *path, u8 *buf, u32 sz)
|
||||
{
|
||||
int ret = -1;
|
||||
struct file *fp;
|
||||
|
||||
if (path && buf) {
|
||||
ret = openFile(&fp, path, O_RDONLY, 0);
|
||||
|
||||
if (ret == 0) {
|
||||
DBG_871X("%s openFile path:%s fp =%p\n", __func__, path , fp);
|
||||
|
||||
ret = readFile(fp, buf, sz);
|
||||
closeFile(fp);
|
||||
|
||||
DBG_871X("%s readFile, ret:%d\n", __func__, ret);
|
||||
|
||||
} else {
|
||||
DBG_871X("%s openFile path:%s Fail, ret:%d\n", __func__, path, ret);
|
||||
}
|
||||
} else {
|
||||
DBG_871X("%s NULL pointer\n", __func__);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Test if the specifi @param path is a file and readable
|
||||
* @param path the path of the file to test
|
||||
* @return true or false
|
||||
*/
|
||||
int rtw_is_file_readable(char *path)
|
||||
{
|
||||
if (isFileReadable(path) == 0)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* Open the file with @param path and retrive the file content into memory starting from @param buf for @param sz at most
|
||||
* @param path the path of the file to open and read
|
||||
* @param buf the starting address of the buffer to store file content
|
||||
* @param sz how many bytes to read at most
|
||||
* @return the byte we've read
|
||||
*/
|
||||
int rtw_retrive_from_file(char *path, u8 *buf, u32 sz)
|
||||
{
|
||||
int ret = retriveFromFile(path, buf, sz);
|
||||
return ret >= 0 ? ret : 0;
|
||||
}
|
||||
|
||||
struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_priv)
|
||||
{
|
||||
struct net_device *pnetdev;
|
||||
|
|
Loading…
Reference in a new issue