Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c67045b authored by Kirill Smelkov's avatar Kirill Smelkov Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: Move sysfs related bits into ehci-sysfs.c 



The only sysfs attr implemented so far is "companion" from ehci-hub.c,
but in the next patch we are going to add another sysfs file, so prior
to that let's structure things and move already-in-there sysfs code to
separate file.

NOTE: All the code I'm moving into this new file was written by Alan
Stern (in 57e06c11 "EHCI: force high-speed devices to run at full
speed"; Jan 16 2007), that's why I'm putting

    Copyright (C) 2007 by Alan Stern

there after explicit request from the author.

Signed-off-by: default avatarKirill Smelkov <kirr@mns.spb.ru>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6f95b4b7

drivers/usb/host/ehci-hcd.c

+3 −2
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static void ehci_work(struct ehci_hcd *ehci); 
#include "ehci-mem.c"

#include "ehci-q.c"

#include "ehci-sched.c"

#include "ehci-sysfs.c"



/*-------------------------------------------------------------------------*/
@@ -520,7 +521,7 @@ static void ehci_stop (struct usb_hcd *hcd) 
	ehci_reset (ehci);

	spin_unlock_irq(&ehci->lock);



	remove_companion_file(ehci);

	remove_sysfs_files(ehci);

	remove_debug_files (ehci);



	/* root hub is shut down separately (first, when possible) */
@@ -754,7 +755,7 @@ static int ehci_run (struct usb_hcd *hcd) 
	 * since the class device isn't created that early.

	 */

	create_debug_files(ehci);

	create_companion_file(ehci);

	create_sysfs_files(ehci);



	return 0;

}

drivers/usb/host/ehci-hub.c

+0 −75
Original line number Diff line number Diff line
@@ -471,29 +471,6 @@ static int ehci_bus_resume (struct usb_hcd *hcd) 


/*-------------------------------------------------------------------------*/



/* Display the ports dedicated to the companion controller */

static ssize_t show_companion(struct device *dev,

			      struct device_attribute *attr,

			      char *buf)

{

	struct ehci_hcd		*ehci;

	int			nports, index, n;

	int			count = PAGE_SIZE;

	char			*ptr = buf;



	ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));

	nports = HCS_N_PORTS(ehci->hcs_params);



	for (index = 0; index < nports; ++index) {

		if (test_bit(index, &ehci->companion_ports)) {

			n = scnprintf(ptr, count, "%d\n", index + 1);

			ptr += n;

			count -= n;

		}

	}

	return ptr - buf;

}



/*

 * Sets the owner of a port

 */
@@ -528,58 +505,6 @@ static void set_owner(struct ehci_hcd *ehci, int portnum, int new_owner) 
	}

}



/*

 * Dedicate or undedicate a port to the companion controller.

 * Syntax is "[-]portnum", where a leading '-' sign means

 * return control of the port to the EHCI controller.

 */

static ssize_t store_companion(struct device *dev,

			       struct device_attribute *attr,

			       const char *buf, size_t count)

{

	struct ehci_hcd		*ehci;

	int			portnum, new_owner;



	ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));

	new_owner = PORT_OWNER;		/* Owned by companion */

	if (sscanf(buf, "%d", &portnum) != 1)

		return -EINVAL;

	if (portnum < 0) {

		portnum = - portnum;

		new_owner = 0;		/* Owned by EHCI */

	}

	if (portnum <= 0 || portnum > HCS_N_PORTS(ehci->hcs_params))

		return -ENOENT;

	portnum--;

	if (new_owner)

		set_bit(portnum, &ehci->companion_ports);

	else

		clear_bit(portnum, &ehci->companion_ports);

	set_owner(ehci, portnum, new_owner);

	return count;

}

static DEVICE_ATTR(companion, 0644, show_companion, store_companion);



static inline int create_companion_file(struct ehci_hcd *ehci)

{

	int	i = 0;



	/* with integrated TT there is no companion! */

	if (!ehci_is_TDI(ehci))

		i = device_create_file(ehci_to_hcd(ehci)->self.controller,

				       &dev_attr_companion);

	return i;

}



static inline void remove_companion_file(struct ehci_hcd *ehci)

{

	/* with integrated TT there is no companion! */

	if (!ehci_is_TDI(ehci))

		device_remove_file(ehci_to_hcd(ehci)->self.controller,

				   &dev_attr_companion);

}





/*-------------------------------------------------------------------------*/



static int check_reset_complete (

drivers/usb/host/ehci-sysfs.c

0 → 100644
+94 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 by Alan Stern

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the

 * Free Software Foundation; either version 2 of the License, or (at your

 * option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY

 * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

 * for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software Foundation,

 * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



/* this file is part of ehci-hcd.c */





/* Display the ports dedicated to the companion controller */

static ssize_t show_companion(struct device *dev,

			      struct device_attribute *attr,

			      char *buf)

{

	struct ehci_hcd		*ehci;

	int			nports, index, n;

	int			count = PAGE_SIZE;

	char			*ptr = buf;



	ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));

	nports = HCS_N_PORTS(ehci->hcs_params);



	for (index = 0; index < nports; ++index) {

		if (test_bit(index, &ehci->companion_ports)) {

			n = scnprintf(ptr, count, "%d\n", index + 1);

			ptr += n;

			count -= n;

		}

	}

	return ptr - buf;

}



/*

 * Dedicate or undedicate a port to the companion controller.

 * Syntax is "[-]portnum", where a leading '-' sign means

 * return control of the port to the EHCI controller.

 */

static ssize_t store_companion(struct device *dev,

			       struct device_attribute *attr,

			       const char *buf, size_t count)

{

	struct ehci_hcd		*ehci;

	int			portnum, new_owner;



	ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));

	new_owner = PORT_OWNER;		/* Owned by companion */

	if (sscanf(buf, "%d", &portnum) != 1)

		return -EINVAL;

	if (portnum < 0) {

		portnum = - portnum;

		new_owner = 0;		/* Owned by EHCI */

	}

	if (portnum <= 0 || portnum > HCS_N_PORTS(ehci->hcs_params))

		return -ENOENT;

	portnum--;

	if (new_owner)

		set_bit(portnum, &ehci->companion_ports);

	else

		clear_bit(portnum, &ehci->companion_ports);

	set_owner(ehci, portnum, new_owner);

	return count;

}

static DEVICE_ATTR(companion, 0644, show_companion, store_companion);



static inline int create_sysfs_files(struct ehci_hcd *ehci)

{

	int	i = 0;



	/* with integrated TT there is no companion! */

	if (!ehci_is_TDI(ehci))

		i = device_create_file(ehci_to_hcd(ehci)->self.controller,

				       &dev_attr_companion);

	return i;

}



static inline void remove_sysfs_files(struct ehci_hcd *ehci)

{

	/* with integrated TT there is no companion! */

	if (!ehci_is_TDI(ehci))

		device_remove_file(ehci_to_hcd(ehci)->self.controller,

				   &dev_attr_companion);

}