On Wednesday 01 April 2009, Justin Waters wrote:
> Currently, the vbus_pin assignment loop is limited by the value of the "ports"
> variable in the platform data. Now that the vbus_pin array is no longer
> flexible, we can use its actual size, which is defined by the preprocessor
> define AT91_USBH_MAX_VBUS_PINS.
>
> Signed-off-by: Justin Waters <justin.waters@xxxxxxxxxxx>
OK, but to my taste I'd just keep "2" in the struct decl
along with ARRAY_SIZE().
> ---
> arch/arm/mach-at91/include/mach/board.h | 3 ++-
> drivers/usb/host/ohci-at91.c | 4 ++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
> index e6afff8..e533bd7 100644
> --- a/arch/arm/mach-at91/include/mach/board.h
> +++ b/arch/arm/mach-at91/include/mach/board.h
> @@ -85,9 +85,10 @@ extern void __init at91_add_device_eth(struct at91_eth_data *data);
> #endif
>
> /* USB Host */
> +#define AT91_USBH_MAX_VBUS_PINS 2
> struct at91_usbh_data {
> u8 ports; /* number of ports on root hub */
> - u8 vbus_pin[2]; /* port power-control pin */
> + u8 vbus_pin[AT91_USBH_MAX_VBUS_PINS]; /* port power-control pin */
> };
> extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
>
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 4ed228a..dc4a23c 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -280,7 +280,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
> * are always powered while this driver is active, and use
> * active-low power switches.
> */
> - for (i = 0; i < pdata->ports; i++) {
> + for (i = 0; i < AT91_USBH_MAX_VBUS_PINS; i++) {
> if (pdata->vbus_pin[i] <= 0)
> continue;
> gpio_request(pdata->vbus_pin[i], "ohci_vbus");
> @@ -298,7 +298,7 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
> int i;
>
> if (pdata) {
> - for (i = 0; i < pdata->ports; i++) {
> + for (i = 0; i < AT91_USBH_MAX_VBUS_PINS; i++) {
> if (pdata->vbus_pin[i] <= 0)
> continue;
> gpio_direction_output(pdata->vbus_pin[i], 1);
> --
> 1.5.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
