aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2006-01-14 16:20:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 21:27:06 -0500
commit858119e159384308a5dde67776691a2ebf70df0f (patch)
treef360768f999d51edc0863917ce0bf79e88c0ec4c /drivers/scsi/megaraid
parentb0a9499c3dd50d333e2aedb7e894873c58da3785 (diff)
[PATCH] Unlinline a bunch of other functions
Remove the "inline" keyword from a bunch of big functions in the kernel with the goal of shrinking it by 30kb to 40kb Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/megaraid')
-rw-r--r--drivers/scsi/megaraid/megaraid_mbox.c10
-rw-r--r--drivers/scsi/megaraid/megaraid_sas.c18
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index d18a4bc2498c..bf9f7f7ba354 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -1266,7 +1266,7 @@ megaraid_mbox_teardown_dma_pools(adapter_t *adapter)
1266 * return the scb from the head of the free list. NULL if there are none 1266 * return the scb from the head of the free list. NULL if there are none
1267 * available 1267 * available
1268 **/ 1268 **/
1269static inline scb_t * 1269static scb_t *
1270megaraid_alloc_scb(adapter_t *adapter, struct scsi_cmnd *scp) 1270megaraid_alloc_scb(adapter_t *adapter, struct scsi_cmnd *scp)
1271{ 1271{
1272 struct list_head *head = &adapter->kscb_pool; 1272 struct list_head *head = &adapter->kscb_pool;
@@ -1329,7 +1329,7 @@ megaraid_dealloc_scb(adapter_t *adapter, scb_t *scb)
1329 * 1329 *
1330 * prepare the scatter-gather list 1330 * prepare the scatter-gather list
1331 */ 1331 */
1332static inline int 1332static int
1333megaraid_mbox_mksgl(adapter_t *adapter, scb_t *scb) 1333megaraid_mbox_mksgl(adapter_t *adapter, scb_t *scb)
1334{ 1334{
1335 struct scatterlist *sgl; 1335 struct scatterlist *sgl;
@@ -1402,7 +1402,7 @@ megaraid_mbox_mksgl(adapter_t *adapter, scb_t *scb)
1402 * 1402 *
1403 * post the command to the controller if mailbox is availble. 1403 * post the command to the controller if mailbox is availble.
1404 */ 1404 */
1405static inline int 1405static int
1406mbox_post_cmd(adapter_t *adapter, scb_t *scb) 1406mbox_post_cmd(adapter_t *adapter, scb_t *scb)
1407{ 1407{
1408 mraid_device_t *raid_dev = ADAP2RAIDDEV(adapter); 1408 mraid_device_t *raid_dev = ADAP2RAIDDEV(adapter);
@@ -2070,7 +2070,7 @@ megaraid_mbox_prepare_epthru(adapter_t *adapter, scb_t *scb,
2070 * 2070 *
2071 * Returns: 1 if the interrupt is valid, 0 otherwise 2071 * Returns: 1 if the interrupt is valid, 0 otherwise
2072 */ 2072 */
2073static inline int 2073static int
2074megaraid_ack_sequence(adapter_t *adapter) 2074megaraid_ack_sequence(adapter_t *adapter)
2075{ 2075{
2076 mraid_device_t *raid_dev = ADAP2RAIDDEV(adapter); 2076 mraid_device_t *raid_dev = ADAP2RAIDDEV(adapter);
@@ -2208,7 +2208,7 @@ megaraid_isr(int irq, void *devp, struct pt_regs *regs)
2208 * 2208 *
2209 * DMA sync if required. 2209 * DMA sync if required.
2210 */ 2210 */
2211static inline void 2211static void
2212megaraid_mbox_sync_scb(adapter_t *adapter, scb_t *scb) 2212megaraid_mbox_sync_scb(adapter_t *adapter, scb_t *scb)
2213{ 2213{
2214 mbox_ccb_t *ccb; 2214 mbox_ccb_t *ccb;
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index c0bb8061401f..511ed52a5807 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -81,7 +81,7 @@ static DEFINE_MUTEX(megasas_async_queue_mutex);
81 * 81 *
82 * Returns a free command from the pool 82 * Returns a free command from the pool
83 */ 83 */
84static inline struct megasas_cmd *megasas_get_cmd(struct megasas_instance 84static struct megasas_cmd *megasas_get_cmd(struct megasas_instance
85 *instance) 85 *instance)
86{ 86{
87 unsigned long flags; 87 unsigned long flags;
@@ -263,7 +263,7 @@ megasas_issue_blocked_abort_cmd(struct megasas_instance *instance,
263 * If successful, this function returns the number of SG elements. Otherwise, 263 * If successful, this function returns the number of SG elements. Otherwise,
264 * it returnes -1. 264 * it returnes -1.
265 */ 265 */
266static inline int 266static int
267megasas_make_sgl32(struct megasas_instance *instance, struct scsi_cmnd *scp, 267megasas_make_sgl32(struct megasas_instance *instance, struct scsi_cmnd *scp,
268 union megasas_sgl *mfi_sgl) 268 union megasas_sgl *mfi_sgl)
269{ 269{
@@ -311,7 +311,7 @@ megasas_make_sgl32(struct megasas_instance *instance, struct scsi_cmnd *scp,
311 * If successful, this function returns the number of SG elements. Otherwise, 311 * If successful, this function returns the number of SG elements. Otherwise,
312 * it returnes -1. 312 * it returnes -1.
313 */ 313 */
314static inline int 314static int
315megasas_make_sgl64(struct megasas_instance *instance, struct scsi_cmnd *scp, 315megasas_make_sgl64(struct megasas_instance *instance, struct scsi_cmnd *scp,
316 union megasas_sgl *mfi_sgl) 316 union megasas_sgl *mfi_sgl)
317{ 317{
@@ -360,7 +360,7 @@ megasas_make_sgl64(struct megasas_instance *instance, struct scsi_cmnd *scp,
360 * This function prepares CDB commands. These are typcially pass-through 360 * This function prepares CDB commands. These are typcially pass-through
361 * commands to the devices. 361 * commands to the devices.
362 */ 362 */
363static inline int 363static int
364megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp, 364megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp,
365 struct megasas_cmd *cmd) 365 struct megasas_cmd *cmd)
366{ 366{
@@ -441,7 +441,7 @@ megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp,
441 * 441 *
442 * Frames (and accompanying SGLs) for regular SCSI IOs use this function. 442 * Frames (and accompanying SGLs) for regular SCSI IOs use this function.
443 */ 443 */
444static inline int 444static int
445megasas_build_ldio(struct megasas_instance *instance, struct scsi_cmnd *scp, 445megasas_build_ldio(struct megasas_instance *instance, struct scsi_cmnd *scp,
446 struct megasas_cmd *cmd) 446 struct megasas_cmd *cmd)
447{ 447{
@@ -563,7 +563,7 @@ megasas_build_ldio(struct megasas_instance *instance, struct scsi_cmnd *scp,
563 * @scp: SCSI command 563 * @scp: SCSI command
564 * @frame_count: [OUT] Number of frames used to prepare this command 564 * @frame_count: [OUT] Number of frames used to prepare this command
565 */ 565 */
566static inline struct megasas_cmd *megasas_build_cmd(struct megasas_instance 566static struct megasas_cmd *megasas_build_cmd(struct megasas_instance
567 *instance, 567 *instance,
568 struct scsi_cmnd *scp, 568 struct scsi_cmnd *scp,
569 int *frame_count) 569 int *frame_count)
@@ -914,7 +914,7 @@ megasas_complete_abort(struct megasas_instance *instance,
914 * @instance: Adapter soft state 914 * @instance: Adapter soft state
915 * @cmd: Completed command 915 * @cmd: Completed command
916 */ 916 */
917static inline void 917static void
918megasas_unmap_sgbuf(struct megasas_instance *instance, struct megasas_cmd *cmd) 918megasas_unmap_sgbuf(struct megasas_instance *instance, struct megasas_cmd *cmd)
919{ 919{
920 dma_addr_t buf_h; 920 dma_addr_t buf_h;
@@ -958,7 +958,7 @@ megasas_unmap_sgbuf(struct megasas_instance *instance, struct megasas_cmd *cmd)
958 * an alternate status (as in the case of aborted 958 * an alternate status (as in the case of aborted
959 * commands) 959 * commands)
960 */ 960 */
961static inline void 961static void
962megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd, 962megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,
963 u8 alt_status) 963 u8 alt_status)
964{ 964{
@@ -1105,7 +1105,7 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,
1105 * SCSI mid-layer instead of the status 1105 * SCSI mid-layer instead of the status
1106 * returned by the FW 1106 * returned by the FW
1107 */ 1107 */
1108static inline int 1108static int
1109megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status) 1109megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status)
1110{ 1110{
1111 u32 status; 1111 u32 status;