Skip to content

Commit 45c88e9

Browse files
committed
Merge tag 'soc_fsl-6.15-1' of https://github.com/chleroy/linux into soc/drivers-2
FSL SOC Changes for 6.15: - irqdomain cleanups from Jiry - Add Ioana as Maintainer of fsl-mc bus and remove Laurentiu and Stuart - Remove deadcode from fsl-mc bus * tag 'soc_fsl-6.15-1' of https://github.com/chleroy/linux: bus: fsl-mc: Remove deadcode MAINTAINERS: add the linuppc-dev list to the fsl-mc bus entry MAINTAINERS: fix nonexistent dtbinding file name MAINTAINERS: add myself as maintainer for the fsl-mc bus irqdomain: soc: Switch to irq_find_mapping()
2 parents 0ad2507 + c25951e commit 45c88e9

File tree

7 files changed

+5
-60
lines changed

7 files changed

+5
-60
lines changed

MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19333,12 +19333,12 @@ F: fs/qnx6/
1933319333
F: include/linux/qnx6_fs.h
1933419334

1933519335
QORIQ DPAA2 FSL-MC BUS DRIVER
19336-
M: Stuart Yoder <stuyoder@gmail.com>
19337-
M: Laurentiu Tudor <laurentiu.tudor@nxp.com>
19336+
M: Ioana Ciornei <ioana.ciornei@nxp.com>
19337+
L: linuxppc-dev@lists.ozlabs.org
1933819338
L: linux-kernel@vger.kernel.org
1933919339
S: Maintained
1934019340
F: Documentation/ABI/stable/sysfs-bus-fsl-mc
19341-
F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
19341+
F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.yaml
1934219342
F: Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst
1934319343
F: drivers/bus/fsl-mc/
1934419344
F: include/uapi/linux/fsl_mc.h

drivers/bus/fsl-mc/dpmcp.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,3 @@ int dpmcp_close(struct fsl_mc_io *mc_io,
7575
/* send command to mc*/
7676
return mc_send_command(mc_io, &cmd);
7777
}
78-
79-
/**
80-
* dpmcp_reset() - Reset the DPMCP, returns the object to initial state.
81-
* @mc_io: Pointer to MC portal's I/O object
82-
* @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
83-
* @token: Token of DPMCP object
84-
*
85-
* Return: '0' on Success; Error code otherwise.
86-
*/
87-
int dpmcp_reset(struct fsl_mc_io *mc_io,
88-
u32 cmd_flags,
89-
u16 token)
90-
{
91-
struct fsl_mc_command cmd = { 0 };
92-
93-
/* prepare command */
94-
cmd.header = mc_encode_cmd_header(DPMCP_CMDID_RESET,
95-
cmd_flags, token);
96-
97-
/* send command to mc*/
98-
return mc_send_command(mc_io, &cmd);
99-
}

drivers/bus/fsl-mc/fsl-mc-allocator.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -656,8 +656,3 @@ int __init fsl_mc_allocator_driver_init(void)
656656
{
657657
return fsl_mc_driver_register(&fsl_mc_allocator_driver);
658658
}
659-
660-
void fsl_mc_allocator_driver_exit(void)
661-
{
662-
fsl_mc_driver_unregister(&fsl_mc_allocator_driver);
663-
}

drivers/bus/fsl-mc/fsl-mc-private.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ int dpmcp_close(struct fsl_mc_io *mc_io,
6666
u32 cmd_flags,
6767
u16 token);
6868

69-
int dpmcp_reset(struct fsl_mc_io *mc_io,
70-
u32 cmd_flags,
71-
u16 token);
72-
7369
/*
7470
* Data Path Resource Container (DPRC) API
7571
*/
@@ -631,8 +627,6 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
631627

632628
int __init fsl_mc_allocator_driver_init(void);
633629

634-
void fsl_mc_allocator_driver_exit(void);
635-
636630
void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev);
637631

638632
void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev);

drivers/bus/fsl-mc/mc-io.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -263,23 +263,3 @@ void fsl_mc_portal_free(struct fsl_mc_io *mc_io)
263263
dpmcp_dev->consumer_link = NULL;
264264
}
265265
EXPORT_SYMBOL_GPL(fsl_mc_portal_free);
266-
267-
/**
268-
* fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object
269-
*
270-
* @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free
271-
*/
272-
int fsl_mc_portal_reset(struct fsl_mc_io *mc_io)
273-
{
274-
int error;
275-
struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev;
276-
277-
error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle);
278-
if (error < 0) {
279-
dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error);
280-
return error;
281-
}
282-
283-
return 0;
284-
}
285-
EXPORT_SYMBOL_GPL(fsl_mc_portal_reset);

drivers/soc/fsl/qe/qe_ic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ static unsigned int qe_ic_get_low_irq(struct qe_ic *qe_ic)
344344
if (irq == 0)
345345
return 0;
346346

347-
return irq_linear_revmap(qe_ic->irqhost, irq);
347+
return irq_find_mapping(qe_ic->irqhost, irq);
348348
}
349349

350350
/* Return an interrupt vector or 0 if no interrupt is pending. */
@@ -360,7 +360,7 @@ static unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic)
360360
if (irq == 0)
361361
return 0;
362362

363-
return irq_linear_revmap(qe_ic->irqhost, irq);
363+
return irq_find_mapping(qe_ic->irqhost, irq);
364364
}
365365

366366
static void qe_ic_cascade_low(struct irq_desc *desc)

include/linux/fsl/mc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,6 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev,
417417

418418
void fsl_mc_portal_free(struct fsl_mc_io *mc_io);
419419

420-
int fsl_mc_portal_reset(struct fsl_mc_io *mc_io);
421-
422420
int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev,
423421
enum fsl_mc_pool_type pool_type,
424422
struct fsl_mc_device **new_mc_adev);

0 commit comments

Comments
 (0)