Commit 58fece78 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/scm: use inline dummy functions 



Convert the defines for the !CONFIG_SCM* stuff to static inline
functions.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 88e7616e

drivers/s390/block/scm_blk.h

+28 −13
Original line number Diff line number Diff line
@@ -68,19 +68,34 @@ void scm_initiate_cluster_request(struct scm_request *); 
void scm_cluster_request_irq(struct scm_request *);

bool scm_test_cluster_request(struct scm_request *);

bool scm_cluster_size_valid(void);

#else

#define __scm_free_rq_cluster(scmrq) {}

#define __scm_alloc_rq_cluster(scmrq) 0

#define scm_request_cluster_init(scmrq) {}

#define scm_reserve_cluster(scmrq) true

#define scm_release_cluster(scmrq) {}

#define scm_blk_dev_cluster_setup(bdev) {}

#define scm_need_cluster_request(scmrq) false

#define scm_initiate_cluster_request(scmrq) {}

#define scm_cluster_request_irq(scmrq) {}

#define scm_test_cluster_request(scmrq) false

#define scm_cluster_size_valid() true

#endif

#else /* CONFIG_SCM_BLOCK_CLUSTER_WRITE */

static inline void __scm_free_rq_cluster(struct scm_request *scmrq) {}

static inline int __scm_alloc_rq_cluster(struct scm_request *scmrq)

{

	return 0;

}

static inline void scm_request_cluster_init(struct scm_request *scmrq) {}

static inline bool scm_reserve_cluster(struct scm_request *scmrq)

{

	return true;

}

static inline void scm_release_cluster(struct scm_request *scmrq) {}

static inline void scm_blk_dev_cluster_setup(struct scm_blk_dev *bdev) {}

static inline bool scm_need_cluster_request(struct scm_request *scmrq)

{

	return false;

}

static inline void scm_initiate_cluster_request(struct scm_request *scmrq) {}

static inline void scm_cluster_request_irq(struct scm_request *scmrq) {}

static inline bool scm_test_cluster_request(struct scm_request *scmrq)

{

	return false;

}

static inline bool scm_cluster_size_valid(void)

{

	return true;

}

#endif /* CONFIG_SCM_BLOCK_CLUSTER_WRITE */



extern debug_info_t *scm_debug;

drivers/s390/cio/chsc.h

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ int chsc_scm_info(struct chsc_scm_info *scm_area, u64 token); 
#ifdef CONFIG_SCM_BUS

int scm_update_information(void);

#else /* CONFIG_SCM_BUS */

#define scm_update_information() 0

static inline int scm_update_information(void) { return 0; }

#endif /* CONFIG_SCM_BUS */