Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb6fc18e authored by Helge Deller's avatar Helge Deller Committed by Kyle McMartin
Browse files

[PARISC] Use kzalloc and other janitor-style cleanups 



Helge,
  o Convert a bunch of kmalloc/memset uses to kzalloc.
  o pci.c: Add some __read_mostly annotations.
  o pci.c: Move constant pci_post_reset_delay to asm/pci.h
  o grfioctl.h: Add A4450A to comment of CRT_ID_VISUALIZE_EG.
  o Add some consts to perf.c/perf_images.h

Matthew,
  o sticore.c: Add some consts to suppress compile warnings.

Signed-off-by: default avatarHelge Deller <deller@parisc-linux.org>
Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent a1c74443

arch/parisc/kernel/drivers.c

+1 −2
Original line number Diff line number Diff line
@@ -408,11 +408,10 @@ static void setup_bus_id(struct parisc_device *padev) 


struct parisc_device * create_tree_node(char id, struct device *parent)

{

	struct parisc_device *dev = kmalloc(sizeof(*dev), GFP_KERNEL);

	struct parisc_device *dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)

		return NULL;



	memset(dev, 0, sizeof(*dev));

	dev->hw_path = id;

	dev->id.hw_type = HPHW_FAULTY;

arch/parisc/kernel/pci.c

+5 −6
Original line number Diff line number Diff line
@@ -47,18 +47,17 @@ 
 * this makes the boot time much longer than necessary.

 * 20ms seems to work for all the HP PCI implementations to date.

 *

 * XXX: turn into a #defined constant in <asm/pci.h> ?

 * #define pci_post_reset_delay 50

 */

int pci_post_reset_delay = 50;



struct pci_port_ops *pci_port;

struct pci_bios_ops *pci_bios;

struct pci_port_ops *pci_port __read_mostly;

struct pci_bios_ops *pci_bios __read_mostly;



int pci_hba_count = 0;

static int pci_hba_count __read_mostly;



/* parisc_pci_hba used by pci_port->in/out() ops to lookup bus data.  */

#define PCI_HBA_MAX 32

struct pci_hba_data *parisc_pci_hba[PCI_HBA_MAX];

struct pci_hba_data *parisc_pci_hba[PCI_HBA_MAX] __read_mostly;





/********************************************************************

arch/parisc/kernel/perf.c

+18 −17
Original line number Diff line number Diff line
@@ -68,20 +68,20 @@ struct rdr_tbl_ent { 
};



static int perf_processor_interface __read_mostly = UNKNOWN_INTF;

static int perf_enabled __read_mostly = 0;

static int perf_enabled __read_mostly;

static spinlock_t perf_lock;

struct parisc_device *cpu_device __read_mostly = NULL;

struct parisc_device *cpu_device __read_mostly;



/* RDRs to write for PCX-W */

static int perf_rdrs_W[] = 

static const int perf_rdrs_W[] =

	{ 0, 1, 4, 5, 6, 15, 16, 17, 18, 20, 21, 22, 23, 24, 25, -1 };



/* RDRs to write for PCX-U */

static int perf_rdrs_U[] =

static const int perf_rdrs_U[] =

	{ 0, 1, 4, 5, 6, 7, 16, 17, 18, 20, 21, 22, 23, 24, 25, -1 };



/* RDR register descriptions for PCX-W */

static struct rdr_tbl_ent perf_rdr_tbl_W[] = {

static const struct rdr_tbl_ent perf_rdr_tbl_W[] = {

	{ 19,	1,	8 },   /* RDR 0 */

	{ 16,	1,	16 },  /* RDR 1 */

	{ 72,	2,	0 },   /* RDR 2 */
@@ -117,7 +117,7 @@ static struct rdr_tbl_ent perf_rdr_tbl_W[] = { 
};



/* RDR register descriptions for PCX-U */

static struct rdr_tbl_ent perf_rdr_tbl_U[] = {

static const struct rdr_tbl_ent perf_rdr_tbl_U[] = {

	{ 19,	1,	8 },              /* RDR 0 */

	{ 32,	1,	16 },             /* RDR 1 */

	{ 20,	1,	0 },              /* RDR 2 */
@@ -156,7 +156,7 @@ static struct rdr_tbl_ent perf_rdr_tbl_U[] = { 
 * A non-zero write_control in the above tables is a byte offset into

 * this array.

 */

static uint64_t perf_bitmasks[] = {

static const uint64_t perf_bitmasks[] = {

	0x0000000000000000ul,     /* first dbl word must be zero */

	0xfdffe00000000000ul,     /* RDR0 bitmask */

	0x003f000000000000ul,     /* RDR1 bitmask */
@@ -173,7 +173,7 @@ static uint64_t perf_bitmasks[] = { 
 * Write control bitmasks for Pa-8700 processor given

 * somethings have changed slightly.

 */

static uint64_t perf_bitmasks_piranha[] = {

static const uint64_t perf_bitmasks_piranha[] = {

	0x0000000000000000ul,     /* first dbl word must be zero */

	0xfdffe00000000000ul,     /* RDR0 bitmask */

	0x003f000000000000ul,     /* RDR1 bitmask */
@@ -186,7 +186,7 @@ static uint64_t perf_bitmasks_piranha[] = { 
	0xfffc000000000000ul

};



static uint64_t *bitmask_array;   /* array of bitmasks to use */

static const uint64_t *bitmask_array;   /* array of bitmasks to use */



/******************************************************************************

 * Function Prototypes
@@ -200,7 +200,7 @@ static ssize_t perf_write(struct file *file, const char __user *buf, size_t coun 
static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

static void perf_start_counters(void);

static int perf_stop_counters(uint32_t *raddr);

static struct rdr_tbl_ent * perf_rdr_get_entry(uint32_t rdr_num);

static const struct rdr_tbl_ent * perf_rdr_get_entry(uint32_t rdr_num);

static int perf_rdr_read_ubuf(uint32_t	rdr_num, uint64_t *buffer);

static int perf_rdr_clear(uint32_t rdr_num);

static int perf_write_image(uint64_t *memaddr);
@@ -655,7 +655,7 @@ static int perf_stop_counters(uint32_t *raddr) 
 * Retrieve a pointer to the description of what this

 * RDR contains.

 */

static struct rdr_tbl_ent * perf_rdr_get_entry(uint32_t rdr_num)

static const struct rdr_tbl_ent * perf_rdr_get_entry(uint32_t rdr_num)

{

	if (perf_processor_interface == ONYX_INTF) {

		return &perf_rdr_tbl_U[rdr_num];
@@ -673,7 +673,7 @@ static int perf_rdr_read_ubuf(uint32_t rdr_num, uint64_t *buffer) 
{

	uint64_t	data, data_mask = 0;

	uint32_t	width, xbits, i;

	struct rdr_tbl_ent *tentry;

	const struct rdr_tbl_ent *tentry;



	tentry = perf_rdr_get_entry(rdr_num);

	if ((width = tentry->width) == 0)
@@ -721,7 +721,7 @@ static int perf_rdr_read_ubuf(uint32_t rdr_num, uint64_t *buffer) 
 */

static int perf_rdr_clear(uint32_t	rdr_num)

{

	struct rdr_tbl_ent *tentry;

	const struct rdr_tbl_ent *tentry;

	int32_t		i;



	tentry = perf_rdr_get_entry(rdr_num);
@@ -753,10 +753,11 @@ static int perf_write_image(uint64_t *memaddr) 
	uint64_t buffer[MAX_RDR_WORDS];

	uint64_t *bptr;

	uint32_t dwords;

	uint32_t *intrigue_rdr;

	uint64_t *intrigue_bitmask, tmp64;

	const uint32_t *intrigue_rdr;

	const uint64_t *intrigue_bitmask;

	uint64_t tmp64;

	void __iomem *runway;

	struct rdr_tbl_ent *tentry;

	const struct rdr_tbl_ent *tentry;

	int i;



	/* Clear out counters */
@@ -830,7 +831,7 @@ static int perf_write_image(uint64_t *memaddr) 
 */

static void perf_rdr_write(uint32_t rdr_num, uint64_t *buffer)

{

	struct rdr_tbl_ent *tentry;

	const struct rdr_tbl_ent *tentry;

	int32_t		i;



printk("perf_rdr_write\n");

arch/parisc/kernel/perf_images.h

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#define PCXU_IMAGE_SIZE 584



static uint32_t onyx_images[][PCXU_IMAGE_SIZE/sizeof(uint32_t)] = {

static uint32_t onyx_images[][PCXU_IMAGE_SIZE/sizeof(uint32_t)] __read_mostly = {

/*

 * CPI:

 *
@@ -2093,7 +2093,7 @@ static uint32_t onyx_images[][PCXU_IMAGE_SIZE/sizeof(uint32_t)] = { 
};

#define PCXW_IMAGE_SIZE 576



static uint32_t cuda_images[][PCXW_IMAGE_SIZE/sizeof(uint32_t)] = {

static uint32_t cuda_images[][PCXW_IMAGE_SIZE/sizeof(uint32_t)] __read_mostly = {

/*

 * CPI:     FROM CPI.IDF (Image 0)

 *

arch/parisc/kernel/traps.c

+1 −2
Original line number Diff line number Diff line
@@ -193,10 +193,9 @@ void show_stack(struct task_struct *task, unsigned long *s) 


HERE:

		asm volatile ("copy %%r30, %0" : "=r"(sp));

		r = (struct pt_regs *)kmalloc(sizeof(struct pt_regs), GFP_KERNEL);

		r = kzalloc(sizeof(struct pt_regs), GFP_KERNEL);

		if (!r)

			return;

		memset(r, 0, sizeof(struct pt_regs));

		r->iaoq[0] = (unsigned long)&&HERE;

		r->gr[2] = (unsigned long)__builtin_return_address(0);

		r->gr[30] = sp;