Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754798AbYGIUiU (ORCPT ); Wed, 9 Jul 2008 16:38:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751526AbYGIUiH (ORCPT ); Wed, 9 Jul 2008 16:38:07 -0400 Received: from hedwig.cmf.nrl.navy.mil ([134.207.12.162]:55817 "EHLO hedwig.cmf.nrl.navy.mil" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522AbYGIUiG (ORCPT ); Wed, 9 Jul 2008 16:38:06 -0400 Message-Id: <200807092037.m69Kbmc0030545@cmf.nrl.navy.mil> From: "Chas Williams (CONTRACTOR)" To: davem@davemloft.net cc: netdev@vger.kernel.org, linux-atm-general@lists.sourceforge.net, linux-kernel@vger.kernel.org, David Woodhouse Subject: Re: [Linux-ATM-General] [PATCH] firmware: convert Ambassador ATM driver to request_firmware() In-reply-to: <1214853492.10393.350.camel@pmac.infradead.org> Date: Wed, 09 Jul 2008 16:37:48 -0400 X-NRLCMF-Spam-Score: () hits=-0.014 X-NRLCMF-Virus-Scanned: No virus found Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1710 Lines: 53 dave, please apply to net-next. thanks! Author: Chas Williams - CONTRACTOR Date: Wed Jul 9 12:39:08 2008 -0400 atm: [fore200e] use MODULE_FIRMWARE() and other suggested cleanups Signed-off-by: Chas Williams diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index d5c1bbf..73338d2 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c @@ -2562,7 +2562,8 @@ fore200e_load_and_start_fw(struct fore200e* fore200e) const struct firmware *firmware; struct device *device; struct fw_header *fw_header; - u32 *fw_data, fw_size; + const __le32 *fw_data; + u32 fw_size; u32 __iomem *load_addr; char buf[48]; int err = -ENODEV; @@ -2582,7 +2583,7 @@ fore200e_load_and_start_fw(struct fore200e* fore200e) return err; } - fw_data = (u32 *) firmware->data; + fw_data = (__le32 *) firmware->data; fw_size = firmware->size / sizeof(u32); fw_header = (struct fw_header *) firmware->data; load_addr = fore200e->virt_base + le32_to_cpu(fw_header->load_offset); @@ -3199,6 +3200,14 @@ static const struct fore200e_bus fore200e_bus[] = { {} }; -#ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); +#ifdef CONFIG_PCI +#ifdef __LITTLE_ENDIAN__ +MODULE_FIRMWARE("pca200e.bin"); +#else +MODULE_FIRMWARE("pca200e_ecd.bin2"); +#endif +#endif /* CONFIG_PCI */ +#ifdef CONFIG_SBUS +MODULE_FIRMWARE("sba200e_ecd.bin2"); #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/