summaryrefslogtreecommitdiffstats
path: root/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2012-12-02 18:51:40 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 12:33:45 -0800
commitdedbc93318b89c0386670a5c3e1de621311a40b0 (patch)
treeaee920344460708ff77392c5fcb1ee25225b362a /drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
parent3aa2303a20e3aac5a8445777b665a433d60c2786 (diff)
downloadop-kernel-dev-dedbc93318b89c0386670a5c3e1de621311a40b0.zip
op-kernel-dev-dedbc93318b89c0386670a5c3e1de621311a40b0.tar.gz
staging: ft1000: rename struct ft1000_device to ft1000_usb
After unifying struct ft1000_info, struct ft1000_device is now wrong name. Rename it to ft1000_usb to match its semantics. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Reviewed-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ft1000/ft1000-usb/ft1000_usb.c')
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_usb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index e97fbc9..1bf3792 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -63,11 +63,11 @@ static int ft1000_probe(struct usb_interface *interface,
unsigned numaltsetting;
int i, ret = 0, size;
- struct ft1000_device *ft1000dev;
+ struct ft1000_usb *ft1000dev;
struct ft1000_info *pft1000info = NULL;
const struct firmware *dsp_fw;
- ft1000dev = kzalloc(sizeof(struct ft1000_device), GFP_KERNEL);
+ ft1000dev = kzalloc(sizeof(struct ft1000_usb), GFP_KERNEL);
if (!ft1000dev) {
pr_err("out of memory allocating device structure\n");
@@ -219,7 +219,7 @@ err_fw:
static void ft1000_disconnect(struct usb_interface *interface)
{
struct ft1000_info *pft1000info;
- struct ft1000_device *ft1000dev;
+ struct ft1000_usb *ft1000dev;
DEBUG("ft1000_disconnect is called\n");
OpenPOWER on IntegriCloud