From: Al Viro <v...@zeniv.linux.org.uk>
Signed-off-by: Al Viro <v...@zeniv.linux.org.uk>
---
drivers/s390/block/xpram.c | 24 ++++++++++++------------
drivers/s390/char/sclp_ftp.c | 10 +++++-----
drivers/s390/cio/qdio.h | 2 +-
drivers/s390/cio/qdio_main.c | 2 +-
drivers/s390/cio/qdio_setup.c | 4 ++--
drivers/s390/cio/qdio_thinint.c | 2 +-
drivers/s390/net/qeth_core_main.c | 4 ++--
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 542c6d0..87d13a6 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -87,7 +87,7 @@ MODULE_LICENSE("GPL");
* -EIO: if pgin failed
* -ENXIO: if xpram has vanished
*/
-static int xpram_page_in (unsigned long page_addr, unsigned int xpage_index)
+static int xpram_page_in (void *page_addr, unsigned int xpage_index)
{
int cc = 2; /* return unused cc 2 if pgin traps */
@@ -117,7 +117,7 @@ static int xpram_page_in (unsigned long page_addr, unsigned
int xpage_index)
* -EIO: if pgout failed
* -ENXIO: if xpram has vanished
*/
-static long xpram_page_out (unsigned long page_addr, unsigned int xpage_index)
+static long xpram_page_out (void *page_addr, unsigned int xpage_index)
{
int cc = 2; /* return unused cc 2 if pgin traps */
@@ -142,14 +142,14 @@ static long xpram_page_out (unsigned long page_addr,
unsigned int xpage_index)
*/
static int xpram_present(void)
{
- unsigned long mem_page;
+ void *mem_page;
int rc;
- mem_page = (unsigned long) __get_free_page(GFP_KERNEL);
+ mem_page = (void *)__get_free_page(GFP_KERNEL);
if (!mem_page)
return -ENOMEM;
rc = xpram_page_in(mem_page, 0);
- free_page((void *)mem_page);
+ free_page(mem_page);
return rc ? -ENXIO : 0;
}
@@ -159,9 +159,9 @@ static int xpram_present(void)
static unsigned long xpram_highest_page_index(void)
{
unsigned int page_index, add_bit;
- unsigned long mem_page;
+ void *mem_page;
- mem_page = (unsigned long) __get_free_page(GFP_KERNEL);
+ mem_page = (void *) __get_free_page(GFP_KERNEL);
if (!mem_page)
return 0;
@@ -173,7 +173,7 @@ static unsigned long xpram_highest_page_index(void)
add_bit >>= 1;
}
- free_page((void *)mem_page);
+ free_page(mem_page);
return page_index;
}
@@ -187,7 +187,7 @@ static blk_qc_t xpram_make_request(struct request_queue *q,
struct bio *bio)
struct bio_vec bvec;
struct bvec_iter iter;
unsigned int index;
- unsigned long page_addr;
+ void *page_addr;
unsigned long bytes;
blk_queue_split(q, &bio, q->bio_split);
@@ -203,10 +203,10 @@ static blk_qc_t xpram_make_request(struct request_queue
*q, struct bio *bio)
goto fail;
index = (bio->bi_iter.bi_sector >> 3) + xdev->offset;
bio_for_each_segment(bvec, bio, iter) {
- page_addr = (unsigned long)
- kmap(bvec.bv_page) + bvec.bv_offset;
+ page_addr = kmap(bvec.bv_page) + bvec.bv_offset;
bytes = bvec.bv_len;
- if ((page_addr & 4095) != 0 || (bytes & 4095) != 0)
+ if (((unsigned long)page_addr & 4095) != 0 ||
+ (bytes & 4095) != 0)
/* More paranoia. */
goto fail;
while (bytes > 0) {
diff --git a/drivers/s390/char/sclp_ftp.c b/drivers/s390/char/sclp_ftp.c
index 726e736..4de9d40 100644
--- a/drivers/s390/char/sclp_ftp.c
+++ b/drivers/s390/char/sclp_ftp.c
@@ -239,7 +239,7 @@ static struct sclp_register sclp_ftp_event = {
int sclp_ftp_startup(void)
{
#ifdef DEBUG
- unsigned long info;
+ void *info;
#endif
int rc;
@@ -248,10 +248,10 @@ int sclp_ftp_startup(void)
return rc;
#ifdef DEBUG
- info = (unsigned long)get_zeroed_page(GFP_KERNEL);
+ info = get_zeroed_page(GFP_KERNEL);
- if (info != 0) {
- struct sysinfo_2_2_2 *info222 = (struct sysinfo_2_2_2 *)info;
+ if (info) {
+ struct sysinfo_2_2_2 *info222 = info;
if (!stsi(info222, 2, 2, 2)) { /* get SYSIB 2.2.2 */
info222->name[sizeof(info222->name) - 1] = '\0';
@@ -260,7 +260,7 @@ int sclp_ftp_startup(void)
info222->lpar_number, info222->name);
}
- free_page((void *)info);
+ free_page(info);
}
#endif /* DEBUG */
return 0;
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 7e70f92..6551443 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -300,7 +300,7 @@ struct qdio_irq {
int perf_stat_enabled;
struct qdr *qdr;
- unsigned long chsc_page;
+ void *chsc_page;
struct qdio_q *input_qs[QDIO_MAX_QUEUES_PER_IRQ];
struct qdio_q *output_qs[QDIO_MAX_QUEUES_PER_IRQ];
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 0b1ffc2..86c4599 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -1282,7 +1282,7 @@ int qdio_allocate(struct qdio_initialize *init_data)
* qdio_establish. In case of low memory and swap on a zfcp disk
* we may not be able to allocate memory otherwise.
*/
- irq_ptr->chsc_page = (unsigned long)get_zeroed_page(GFP_KERNEL);
+ irq_ptr->chsc_page = get_zeroed_page(GFP_KERNEL);
if (!irq_ptr->chsc_page)
goto out_rel;
diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 637d1a8..7322dd3 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -309,7 +309,7 @@ int qdio_setup_get_ssqd(struct qdio_irq *irq_ptr,
if (!ssqd)
return -ENOMEM;
} else {
- ssqd = (struct chsc_ssqd_area *)irq_ptr->chsc_page;
+ ssqd = irq_ptr->chsc_page;
}
rc = chsc_ssqd(*schid, ssqd);
@@ -389,7 +389,7 @@ void qdio_release_memory(struct qdio_irq *irq_ptr)
}
}
free_page(irq_ptr->qdr);
- free_page((void *)irq_ptr->chsc_page);
+ free_page(irq_ptr->chsc_page);
free_page(irq_ptr);
}
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index 5d06253..ff0355d5 100644
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -213,7 +213,7 @@ static void tiqdio_thinint_handler(struct airq_struct *airq)
static int set_subchannel_ind(struct qdio_irq *irq_ptr, int reset)
{
- struct chsc_scssc_area *scssc = (void *)irq_ptr->chsc_page;
+ struct chsc_scssc_area *scssc = irq_ptr->chsc_page;
u64 summary_indicator_addr, subchannel_indicator_addr;
int rc;
diff --git a/drivers/s390/net/qeth_core_main.c
b/drivers/s390/net/qeth_core_main.c
index b6bd54c..18f4db4 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3160,7 +3160,7 @@ static int qeth_query_setdiagass(struct qeth_card *card)
static void qeth_get_trap_id(struct qeth_card *card, struct qeth_trap_id *tid)
{
- unsigned long info = (unsigned long)get_zeroed_page(GFP_KERNEL);
+ void *info = get_zeroed_page(GFP_KERNEL);
struct sysinfo_2_2_2 *info222 = (struct sysinfo_2_2_2 *)info;
struct sysinfo_3_2_2 *info322 = (struct sysinfo_3_2_2 *)info;
struct ccw_dev_id ccwid;
@@ -3179,7 +3179,7 @@ static void qeth_get_trap_id(struct qeth_card *card,
struct qeth_trap_id *tid)
EBCASC(info322->vm[0].name, sizeof(info322->vm[0].name));
memcpy(tid->vmname, info322->vm[0].name, sizeof(tid->vmname));
}
- free_page((void *)info);
+ free_page(info);
return;
}
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
