From: Alexis Bruemmer <alexisb@us.ibm.com>
To: linux-scsi <linux-scsi@vger.kernel.org>
Subject: [PATCH 5/8] aic94xx: remove inline functions
Date: Tue, 09 May 2006 14:33:57 -0700 [thread overview]
Message-ID: <1147210437.11847.55.camel@localhost.localdomain> (raw)
In-Reply-To: <1147209211.11847.33.camel@localhost.localdomain>
Remove various needless inline functions
Signed-off-by: Alexis Bruemmer <alexisb@us.ibm.com>
Signed-off-by: Mike Anderson <andmike@us.ibm.com>
---
drivers/scsi/sas/sas_discover.c | 23 ++++++++++++++++++++++-
drivers/scsi/sas/sas_expander.c | 22 +++++++++++-----------
drivers/scsi/sas/sas_scsi_host.c | 6 +++---
include/scsi/sas/sas_discover.h | 22 ++--------------------
4 files changed, 38 insertions(+), 35 deletions(-)
Index: aic94xx-sas-2.6-patched/drivers/scsi/sas/sas_discover.c
===================================================================
--- aic94xx-sas-2.6-patched.orig/drivers/scsi/sas/sas_discover.c
+++ aic94xx-sas-2.6-patched/drivers/scsi/sas/sas_discover.c
@@ -36,6 +36,27 @@
/* ---------- Basic task processing for discovery purposes ---------- */
+void sas_init_dev(struct domain_device *dev)
+{
+ INIT_LIST_HEAD(&dev->siblings);
+ INIT_LIST_HEAD(&dev->dev_list_node);
+ switch (dev->dev_type) {
+ case SAS_END_DEV:
+ break;
+ case EDGE_DEV:
+ case FANOUT_DEV:
+ INIT_LIST_HEAD(&dev->ex_dev.children);
+ break;
+ case SATA_DEV:
+ case SATA_PM:
+ case SATA_PM_PORT:
+ INIT_LIST_HEAD(&dev->sata_dev.children);
+ break;
+ default:
+ break;
+ }
+}
+
static void sas_task_timedout(unsigned long _task)
{
struct sas_task *task = (void *) _task;
@@ -300,7 +321,7 @@ static int sas_get_port_device(struct sa
/* ---------- SATA ---------- */
-static inline void sas_get_ata_command_set(struct domain_device *dev)
+static void sas_get_ata_command_set(struct domain_device *dev)
{
struct dev_to_host_fis *fis =
(struct dev_to_host_fis *) dev->frame_rcvd;
Index: aic94xx-sas-2.6-patched/drivers/scsi/sas/sas_expander.c
===================================================================
--- aic94xx-sas-2.6-patched.orig/drivers/scsi/sas/sas_expander.c
+++ aic94xx-sas-2.6-patched/drivers/scsi/sas/sas_expander.c
@@ -289,7 +289,7 @@ out_err:
#define MAX_EXPANDER_PHYS 128
-static inline void ex_assign_report_general(struct domain_device *dev,
+static void ex_assign_report_general(struct domain_device *dev,
struct smp_resp *resp)
{
struct report_general_resp *rg = &resp->rg;
@@ -354,7 +354,7 @@ out:
return res;
}
-static inline void ex_assign_manuf_info(struct domain_device *dev, void
+static void ex_assign_manuf_info(struct domain_device *dev, void
*_mi_resp)
{
u8 *mi_resp = _mi_resp;
@@ -453,7 +453,7 @@ static inline void sas_ex_disable_phy(st
phy->linkrate = PHY_DISABLED;
}
-static inline void sas_ex_disable_port(struct domain_device *dev, u8 *sas_addr)
+static void sas_ex_disable_port(struct domain_device *dev, u8 *sas_addr)
{
struct expander_device *ex = &dev->ex_dev;
int i;
@@ -470,7 +470,7 @@ static inline void sas_ex_disable_port(s
}
}
-static inline int sas_dev_present_in_domain(struct sas_port *port,
+static int sas_dev_present_in_domain(struct sas_port *port,
u8 *sas_addr)
{
struct domain_device *dev;
@@ -487,7 +487,7 @@ static inline int sas_dev_present_in_dom
#define RPS_REQ_SIZE 16
#define RPS_RESP_SIZE 60
-static inline int sas_get_report_phy_sata(struct domain_device *dev,
+static int sas_get_report_phy_sata(struct domain_device *dev,
int phy_id,
struct smp_resp *rps_resp)
{
@@ -507,7 +507,7 @@ static inline int sas_get_report_phy_sat
return 0;
}
-static inline void sas_ex_get_linkrate(struct domain_device *parent,
+static void sas_ex_get_linkrate(struct domain_device *parent,
struct domain_device *child,
struct ex_phy *parent_phy)
{
@@ -774,7 +774,7 @@ static int sas_ex_discover_dev(struct do
return res;
}
-static inline int sas_find_sub_addr(struct domain_device *dev, u8 *sub_addr)
+static int sas_find_sub_addr(struct domain_device *dev, u8 *sub_addr)
{
struct expander_device *ex = &dev->ex_dev;
int i;
@@ -915,7 +915,7 @@ static int sas_check_ex_subtractive_boun
return 0;
}
-static inline void sas_print_parent_topology_bug(struct domain_device *child,
+static void sas_print_parent_topology_bug(struct domain_device *child,
struct ex_phy *parent_phy,
struct ex_phy *child_phy)
{
@@ -945,7 +945,7 @@ static inline void sas_print_parent_topo
ra_char[child_phy->routing_attr]);
}
-static inline int sas_check_eeds(struct domain_device *child,
+static int sas_check_eeds(struct domain_device *child,
struct ex_phy *parent_phy,
struct ex_phy *child_phy)
{
@@ -1173,7 +1173,7 @@ out:
return res;
}
-static inline int sas_configure_phy(struct domain_device *dev, int phy_id,
+static int sas_configure_phy(struct domain_device *dev, int phy_id,
u8 *sas_addr, int include)
{
int index;
@@ -1590,7 +1590,7 @@ out:
return res;
}
-static inline int sas_discover_new(struct domain_device *dev, int phy_id)
+static int sas_discover_new(struct domain_device *dev, int phy_id)
{
struct ex_phy *ex_phy = &dev->ex_dev.ex_phy[phy_id];
struct domain_device *child;
Index: aic94xx-sas-2.6-patched/drivers/scsi/sas/sas_scsi_host.c
===================================================================
--- aic94xx-sas-2.6-patched.orig/drivers/scsi/sas/sas_scsi_host.c
+++ aic94xx-sas-2.6-patched/drivers/scsi/sas/sas_scsi_host.c
@@ -123,7 +123,7 @@ static void sas_scsi_task_done(struct sa
sc->scsi_done(sc);
}
-static inline enum task_attribute sas_scsi_get_task_attr(struct scsi_cmnd *cmd)
+static enum task_attribute sas_scsi_get_task_attr(struct scsi_cmnd *cmd)
{
enum task_attribute ta = TASK_ATTR_SIMPLE;
if (cmd->request && blk_rq_tagged(cmd->request)) {
@@ -134,7 +134,7 @@ static inline enum task_attribute sas_sc
return ta;
}
-static inline struct sas_task *sas_create_task(struct scsi_cmnd *cmd,
+static struct sas_task *sas_create_task(struct scsi_cmnd *cmd,
struct domain_device *dev,
unsigned long gfp_flags)
{
@@ -167,7 +167,7 @@ static inline struct sas_task *sas_creat
return task;
}
-static inline int sas_queue_up(struct sas_task *task)
+static int sas_queue_up(struct sas_task *task)
{
struct sas_ha_struct *sas_ha = task->dev->port->ha;
struct scsi_core *core = &sas_ha->core;
Index: aic94xx-sas-2.6-patched/include/scsi/sas/sas_discover.h
===================================================================
--- aic94xx-sas-2.6-patched.orig/include/scsi/sas/sas_discover.h
+++ aic94xx-sas-2.6-patched/include/scsi/sas/sas_discover.h
@@ -122,26 +122,6 @@ struct domain_device {
pos = n, n = list_entry(n->member.prev, typeof(*n), member))
-static inline void sas_init_dev(struct domain_device *dev)
-{
- INIT_LIST_HEAD(&dev->siblings);
- INIT_LIST_HEAD(&dev->dev_list_node);
- switch (dev->dev_type) {
- case SAS_END_DEV:
- break;
- case EDGE_DEV:
- case FANOUT_DEV:
- INIT_LIST_HEAD(&dev->ex_dev.children);
- break;
- case SATA_DEV:
- case SATA_PM:
- case SATA_PM_PORT:
- INIT_LIST_HEAD(&dev->sata_dev.children);
- break;
- default:
- break;
- }
-}
void sas_init_disc(struct sas_discovery *disc, struct sas_port *port);
int sas_discover_event(struct sas_port *sas_port, enum discover_event ev);
@@ -153,4 +133,6 @@ void sas_unregister_dev(struct domain_de
void sas_unregister_devices(struct sas_ha_struct *sas_ha);
+void sas_init_dev(struct domain_device *dev);
+
#endif /* _SAS_DISCOVER_H_ */
next prev parent reply other threads:[~2006-05-09 21:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-09 21:13 [PATCH 0/8] aic94xx: sas code clean-up Alexis Bruemmer
2006-05-09 21:20 ` [PATCH 1/8] aic94xx: move sas README Alexis Bruemmer
2006-05-09 21:25 ` [PATCH 2/8] aic94xx: remove the sas_common.c file Alexis Bruemmer
2006-05-09 21:27 ` [PATCH 3/8] aic94xx: remove the //depot SCM comments Alexis Bruemmer
2006-05-09 21:31 ` [PATCH 4/8] aic94xx: remove expander_conf.c Alexis Bruemmer
2006-05-10 6:56 ` Luben Tuikov
2006-05-09 21:33 ` Alexis Bruemmer [this message]
2006-05-09 21:37 ` [PATCH 6/8] aic94xx: move list_each_entry_reverse_safe from sas_discover.h to list.h Alexis Bruemmer
2006-05-10 7:01 ` Luben Tuikov
2006-05-10 7:07 ` Luben Tuikov
2006-05-09 21:39 ` [PATCH 7/8] aic94xx: remove queue implementation comment Alexis Bruemmer
2006-05-10 7:09 ` Luben Tuikov
2006-05-09 21:42 ` [PATCH 8/8] aic94xx: use bitops for testing, setting and clearing bits Alexis Bruemmer
2006-05-09 21:53 ` Rolf Eike Beer
2006-05-10 6:53 ` [PATCH 0/8] aic94xx: sas code clean-up Luben Tuikov
2006-05-10 7:21 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1147210437.11847.55.camel@localhost.localdomain \
--to=alexisb@us.ibm.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.