aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/f_mass_storage.c
diff options
context:
space:
mode:
authorChristoph Egger <siccegge@stud.informatik.uni-erlangen.de>2010-02-05 07:24:12 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 17:54:57 -0500
commit90f7976880bbbf9968629500972f8e2f80401217 (patch)
treeac2b80ef761ce6ce328fc5a9d672c80a57c762d7 /drivers/usb/gadget/f_mass_storage.c
parent8e7e61dfbf1ec6418bf89505980b158a8d00d877 (diff)
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.c8
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 e6abde39857..b1935fe156a 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,
2776 if (cfg->release != 0xffff) { 2776 if (cfg->release != 0xffff) {
2777 i = cfg->release; 2777 i = cfg->release;
2778 } else { 2778 } else {
2779 /* The sa1100 controller is not supported */ 2779 i = usb_gadget_controller_number(gadget);
2780 i = gadget_is_sa1100(gadget)
2781 ? -1
2782 : usb_gadget_controller_number(gadget);
2783 if (i >= 0) { 2780 if (i >= 0) {
2784 i = 0x0300 + i; 2781 i = 0x0300 + i;
2785 } else { 2782 } else {
@@ -2804,8 +2801,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
2804 * disable stalls. 2801 * disable stalls.
2805 */ 2802 */
2806 common->can_stall = cfg->can_stall && 2803 common->can_stall = cfg->can_stall &&
2807 !(gadget_is_sh(common->gadget) || 2804 !(gadget_is_at91(common->gadget));
2808 gadget_is_at91(common->gadget));
2809 2805
2810 2806
2811 spin_lock_init(&common->lock); 2807 spin_lock_init(&common->lock);