diff options
| author | Christoph Egger <siccegge@stud.informatik.uni-erlangen.de> | 2010-02-05 13:24:12 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 14:54:57 -0800 |
| commit | 90f7976880bbbf9968629500972f8e2f80401217 (patch) | |
| tree | ac2b80ef761ce6ce328fc5a9d672c80a57c762d7 /drivers/usb/gadget/f_mass_storage.c | |
| parent | 8e7e61dfbf1ec6418bf89505980b158a8d00d877 (diff) | |
| download | kernel_samsung_aries-90f7976880bbbf9968629500972f8e2f80401217.zip kernel_samsung_aries-90f7976880bbbf9968629500972f8e2f80401217.tar.gz kernel_samsung_aries-90f7976880bbbf9968629500972f8e2f80401217.tar.bz2 | |
USB: Remove unsupported usb gadget drivers
A bunch of USB gadget drivers where never ported from the linux 2.4
series to 2.6 kernels. However there's some code still in the tree for
them which isn't used and is probably untested for ages.
As the chance of these drivers being forward ported is probably quite
small now it might be time to get rid of them.
Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/f_mass_storage.c')
| -rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index e6abde3..b1935fe 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -2776,10 +2776,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, if (cfg->release != 0xffff) { i = cfg->release; } else { - /* The sa1100 controller is not supported */ - i = gadget_is_sa1100(gadget) - ? -1 - : usb_gadget_controller_number(gadget); + i = usb_gadget_controller_number(gadget); if (i >= 0) { i = 0x0300 + i; } else { @@ -2804,8 +2801,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, * disable stalls. */ common->can_stall = cfg->can_stall && - !(gadget_is_sh(common->gadget) || - gadget_is_at91(common->gadget)); + !(gadget_is_at91(common->gadget)); spin_lock_init(&common->lock); |